undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: minor grammatical fixes.

Browse Source 
The final hunk in this patch corrects what appears to be a typo:

of --> or

Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David J. Mellor 2009-03-01 22:42:44 -08:00 committed by Junio C Hamano
parent a7d64b52da
commit 1d035f8564
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/git-apply.txt
View File

@ -25,7 +25,7 @@ and a work tree.
OPTIONS OPTIONS
------- -------
<patch>...:: <patch>...::
The files to read patch from. '-' can be used to read The files to read the patch from. '-' can be used to read
from the standard input. from the standard input.
--stat:: --stat::
@ -33,8 +33,8 @@ OPTIONS
input. Turns off "apply". input. Turns off "apply".
--numstat:: --numstat::
Similar to \--stat, but shows number of added and Similar to \--stat, but shows the number of added and
deleted lines in decimal notation and pathname without deleted lines in decimal notation and the pathname without
abbreviation, to make it more machine friendly. For abbreviation, to make it more machine friendly. For
binary files, outputs two `-` instead of saying binary files, outputs two `-` instead of saying
`0 0`. Turns off "apply". `0 0`. Turns off "apply".
@ -60,15 +60,15 @@ OPTIONS
causes the index file to be updated. causes the index file to be updated.
--cached:: --cached::
Apply a patch without touching the working tree. Instead, take the Apply a patch without touching the working tree. Instead take the
cached data, apply the patch, and store the result in the index, cached data, apply the patch, and store the result in the index
without using the working tree. This implies '--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' Newer 'git-diff' output has embedded 'index information'
for each blob to help identify the original version that for each blob to help identify the original version that
the patch applies to. When this flag is given, and if the patch applies to. When this flag is given, and if
the original versions of the blobs is available locally, the original versions of the blobs are available locally,
builds a temporary index containing those blobs. builds a temporary index containing those blobs.
+ +
When a pure mode change is encountered (which has no index information), When a pure mode change is encountered (which has no index information),
@ -109,13 +109,13 @@ the information is read from the current index instead.
applying a diff generated with --unified=0. To bypass these applying a diff generated with --unified=0. To bypass these
checks use '--unidiff-zero'. checks use '--unidiff-zero'.
+ +
Note, for the reasons stated above usage of context-free patches are Note, for the reasons stated above usage of context-free patches is
discouraged. discouraged.
--apply:: --apply::
If you use any of the options marked "Turns off 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
information you asked without actually applying the requested information without actually applying the
patch. Give this flag after those flags to also apply patch. Give this flag after those flags to also apply
the patch. the patch.
@ -124,7 +124,7 @@ discouraged.
patch. This can be used to extract the common part between patch. This can be used to extract the common part between
two files by first running 'diff' on them and applying two files by first running 'diff' on them and applying
the result with this option, which would apply the the result with this option, which would apply the
deletion part but not addition part. deletion part but not the addition part.
--allow-binary-replacement:: --allow-binary-replacement::
--binary:: --binary::
@ -162,7 +162,7 @@ By default, the command outputs warning messages but applies the patch.
When `git-apply` is used for statistics and not applying a When `git-apply` is used for statistics and not applying a
patch, it defaults to `nowarn`. patch, it defaults to `nowarn`.
+ +
You can use different `<action>` to control this You can use different `<action>` values to control this
behavior: behavior:
+ +
* `nowarn` turns off the trailing whitespace warning. * `nowarn` turns off the trailing whitespace warning.
@ -170,7 +170,7 @@ behavior:
patch as-is (default). patch as-is (default).
* `fix` outputs warnings for a few such errors, and applies the * `fix` outputs warnings for a few such errors, and applies the
patch after fixing them (`strip` is a synonym --- the tool patch after fixing them (`strip` is a synonym --- the tool
used to consider only trailing whitespaces as errors, and the used to consider only trailing whitespace characters as errors, and the
fix involved 'stripping' them, but modern gits do more). fix involved 'stripping' them, but modern gits do more).
* `error` outputs warnings for a few such errors, and refuses * `error` outputs warnings for a few such errors, and refuses
to apply the patch. to apply the patch.
@ -195,7 +195,7 @@ behavior:
adjusting the hunk headers appropriately). adjusting the hunk headers appropriately).
--directory=<root>:: --directory=<root>::
Prepend <root> to all filenames. If a "-p" argument was passed, too, Prepend <root> to all filenames. If a "-p" argument was also passed,
it is applied before prepending the new root. it is applied before prepending the new root.
+ +
For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh`
@ -221,7 +221,7 @@ ignored, i.e., they are not required to be up-to-date or clean and they
are not updated. are not updated.
If --index is not specified, then the submodule commits in the patch If --index is not specified, then the submodule commits in the patch
are ignored and only the absence of presence of the corresponding are ignored and only the absence or presence of the corresponding
subdirectory is checked and (if possible) updated. subdirectory is checked and (if possible) updated.
Author Author