diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-09-23 21:16:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-23 21:16:33 -0700 |
| commit | 52d5bc9a161f839b78ec06c25736d09703fda802 (patch) | |
| tree | 8ef92ac1a031de4929da08ce29cc878d6525be31 /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | apply: get rid of --index-info in favor of --build-fake-ancestor (diff) | |
| download | tgif-52d5bc9a161f839b78ec06c25736d09703fda802.tar.xz | |
Merge branch 'js/apply-build-ancestor'
* js/apply-build-ancestor:
apply: get rid of --index-info in favor of --build-fake-ancestor
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 4c7e3a2f7f..c1c54bfe0b 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] - [--apply] [--no-add] [--index-info] [-R | --reverse] + [--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--cached] [--whitespace=<nowarn|warn|error|error-all|strip>] @@ -63,12 +63,15 @@ OPTIONS cached data, apply the patch, and store the result in the index, without using the working tree. This implies '--index'. ---index-info:: +--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 - the original version of the blob is available locally, - outputs information about them to the standard output. + the original versions of the blobs is available locally, + builds a temporary index containing those blobs. ++ +When a pure mode change is encountered (which has no index information), +the information is read from the current index instead. -R, --reverse:: Apply the patch in reverse. |