diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
| commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
| tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-apply.txt | |
| parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
| download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-apply.txt b/git-apply.txt index c2528a765..8463439ac 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -69,7 +69,7 @@ OPTIONS without using the working tree. This implies `--index`. --build-fake-ancestor=<file>:: - Newer 'git-diff' output has embedded 'index information' + 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 versions of the blobs are available locally, @@ -83,7 +83,7 @@ the information is read from the current index instead. Apply the patch in reverse. --reject:: - For atomicity, 'git-apply' by default fails the whole patch and + For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the @@ -109,7 +109,7 @@ any of those replacements occurred. ever ignored. --unidiff-zero:: - By default, 'git-apply' expects that the patch being + By default, 'git apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with `--unified=0`. To bypass these @@ -120,7 +120,7 @@ discouraged. --apply:: If you use any of the options marked "Turns off - 'apply'" above, 'git-apply' reads and outputs the + 'apply'" above, 'git apply' reads and outputs the requested information without actually applying the patch. Give this flag after those flags to also apply the patch. @@ -229,7 +229,7 @@ apply.whitespace:: Submodules ---------- -If the patch contains any changes to submodules then 'git-apply' +If the patch contains any changes to submodules then 'git apply' treats these changes as follows. If `--index` is specified (explicitly or implicitly), then the submodule |