diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
| commit | bd53dbff51079dc26ea27b00d94b28a5229c0fec (patch) | |
| tree | ed0a78743f67e293b2302e91fefa24e6e579c428 /git-apply.txt | |
| parent | 4efe0e79bcead21602c1f6669f07d4739358ca1a (diff) | |
| download | git-htmldocs-bd53dbff51079dc26ea27b00d94b28a5229c0fec.tar.gz | |
Autogenerated HTML docs for v1.6.1-203-ga83c8
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-apply.txt b/git-apply.txt index e726510ab..9400f6a5d 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git apply' [--stat] [--numstat] [--summary] [--check] [--index] - [--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse] + [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [--whitespace=<nowarn|warn|fix|error|error-all>] @@ -64,7 +64,7 @@ OPTIONS cached data, apply the patch, and store the result in the index, without using the working tree. This implies '--index'. ---build-fake-ancestor <file>:: +--build-fake-ancestor=<file>:: Newer 'git-diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if |