diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-09-24 07:37:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-09-24 07:37:30 +0000 |
| commit | 01d8f834b49b23198aaf6ab7d503b8e918876c7a (patch) | |
| tree | b27e641e954f306bb5afe67f56487c5c11c8a81b /git-apply.txt | |
| parent | 9810d63e3fcf38b02b3ccc9191b4807f7825982e (diff) | |
| download | git-htmldocs-01d8f834b49b23198aaf6ab7d503b8e918876c7a.tar.gz | |
Autogenerated HTML docs for v1.5.3.2-99-ge4b2
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/git-apply.txt b/git-apply.txt index 4c7e3a2f7..c1c54bfe0 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] [--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. |