@@ -25,16 +25,16 @@ and a work tree.
2525OPTIONS
2626-------
2727<patch>...::
28- The files to read patch from. '-' can be used to read
28+ The files to read the patch from. '-' can be used to read
2929 from the standard input.
3030
3131--stat::
3232 Instead of applying the patch, output diffstat for the
3333 input. Turns off "apply".
3434
3535--numstat::
36- Similar to \--stat, but shows number of added and
37- deleted lines in decimal notation and pathname without
36+ Similar to \--stat, but shows the number of added and
37+ deleted lines in decimal notation and the pathname without
3838 abbreviation, to make it more machine friendly. For
3939 binary files, outputs two `-` instead of saying
4040 `0 0`. Turns off "apply".
@@ -60,15 +60,15 @@ OPTIONS
6060 causes the index file to be updated.
6161
6262--cached::
63- Apply a patch without touching the working tree. Instead, take the
64- cached data, apply the patch, and store the result in the index,
63+ Apply a patch without touching the working tree. Instead take the
64+ cached data, apply the patch, and store the result in the index
6565 without using the working tree. This implies '--index'.
6666
6767--build-fake-ancestor=<file>::
6868 Newer 'git-diff' output has embedded 'index information'
6969 for each blob to help identify the original version that
7070 the patch applies to. When this flag is given, and if
71- the original versions of the blobs is available locally,
71+ the original versions of the blobs are available locally,
7272 builds a temporary index containing those blobs.
7373+
7474When a pure mode change is encountered (which has no index information),
@@ -109,13 +109,13 @@ the information is read from the current index instead.
109109 applying a diff generated with --unified=0. To bypass these
110110 checks use '--unidiff-zero'.
111111+
112- Note, for the reasons stated above usage of context-free patches are
112+ Note, for the reasons stated above usage of context-free patches is
113113discouraged.
114114
115115--apply::
116116 If you use any of the options marked "Turns off
117117 'apply'" above, 'git-apply' reads and outputs the
118- information you asked without actually applying the
118+ requested information without actually applying the
119119 patch. Give this flag after those flags to also apply
120120 the patch.
121121
@@ -124,7 +124,7 @@ discouraged.
124124 patch. This can be used to extract the common part between
125125 two files by first running 'diff' on them and applying
126126 the result with this option, which would apply the
127- deletion part but not addition part.
127+ deletion part but not the addition part.
128128
129129--allow-binary-replacement::
130130--binary::
@@ -162,15 +162,15 @@ By default, the command outputs warning messages but applies the patch.
162162When `git-apply` is used for statistics and not applying a
163163patch, it defaults to `nowarn`.
164164+
165- You can use different `<action>` to control this
165+ You can use different `<action>` values to control this
166166behavior:
167167+
168168* `nowarn` turns off the trailing whitespace warning.
169169* `warn` outputs warnings for a few such errors, but applies the
170170 patch as-is (default).
171171* `fix` outputs warnings for a few such errors, and applies the
172172 patch after fixing them (`strip` is a synonym --- the tool
173- used to consider only trailing whitespaces as errors, and the
173+ used to consider only trailing whitespace characters as errors, and the
174174 fix involved 'stripping' them, but modern gits do more).
175175* `error` outputs warnings for a few such errors, and refuses
176176 to apply the patch.
@@ -195,7 +195,7 @@ behavior:
195195 adjusting the hunk headers appropriately).
196196
197197--directory=<root>::
198- Prepend <root> to all filenames. If a "-p" argument was passed, too ,
198+ Prepend <root> to all filenames. If a "-p" argument was also passed ,
199199 it is applied before prepending the new root.
200200+
201201For 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
221221are not updated.
222222
223223If --index is not specified, then the submodule commits in the patch
224- are ignored and only the absence of presence of the corresponding
224+ are ignored and only the absence or presence of the corresponding
225225subdirectory is checked and (if possible) updated.
226226
227227Author
0 commit comments