Reputation: 11830

How to apply `git diff` patch without Git installed?

How can my client apply patch created by git diff without git installed? I have tried to use patch command but it always asks file name to patch.

Upvotes: 306

Answers (5)

Shashi

Reputation: 2175

Try this:

$ git apply file.diff

Upvotes: -26

Andrey Kuznetsov

Reputation: 11830

git diff > patchfile

and

patch -p1 < patchfile

work but as many people noticed in comments and other answers patch does not understand adds, deletes and renames. There is no option but git apply patchfile if you need handle file adds, deletes and renames.

EDIT December 2015

Latest versions of patch command (2.7, released in September 2012) support most features of the "diff --git" format, including renames and copies, permission changes, and symlink diffs (but not yet binary diffs) (release announcement).

So provided one uses current/latest version of patch there is no need to use git to be able to apply its diff as a patch.

Upvotes: 462

denis.peplin

Reputation: 9841

I use

patch -p1 --merge < patchfile

This way, conflicts may be resolved as usual.

Upvotes: 9

Sola Yang

Reputation: 985

Use

git apply patchfile

if possible.

patch -p1 < patchfile

has potential side-effect.

git apply also handles file adds, deletes, and renames if they're described in the git diff format, which patch won't do. Finally, git apply is an "apply all or abort all" model where either everything is applied or nothing is, whereas patch can partially apply patch files, leaving your working directory in a weird state.

Upvotes: 51

suppie

Reputation: 1097

try this:

patch -p1 < patchfile

Upvotes: 79

How to apply `git diff` patch without Git installed?

Answers (5)

Related Questions