Documentation: minor grammatical fixes.
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>
David J. Mellor committed
Mar 1, 2009 at 22:42 UTC
1d035f85649cbb0a4fcc3e341f7e854acf9cf3c1
1 file changed
+13
-13
Documentation/git-apply.txt
+13
-13
@@ -25,7 +25,7 @@ and a work tree.
25
OPTIONS
26
-------
27
<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
29
from the standard input.
30
31
--stat::
@@ -33,8 +33,8 @@ OPTIONS
33
input. Turns off "apply".
34
35
--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
38
abbreviation, to make it more machine friendly. For
39
binary files, outputs two `-` instead of saying
40
`0 0`. Turns off "apply".
@@ -60,15 +60,15 @@ OPTIONS
60
causes the index file to be updated.
61
62
--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
65
without using the working tree. This implies '--index'.
66
67
--build-fake-ancestor=<file>::
68
Newer 'git-diff' output has embedded 'index information'
69
for each blob to help identify the original version that
70
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,
72
builds a temporary index containing those blobs.
73
+
74
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.
109
applying a diff generated with --unified=0. To bypass these
110
checks use '--unidiff-zero'.
111
+
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
113
discouraged.
114
115
--apply::
116
If you use any of the options marked "Turns off
117
'apply'" above, 'git-apply' reads and outputs the
118
- information you asked without actually applying the
118
+ requested information without actually applying the
119
patch. Give this flag after those flags to also apply
120
the patch.
121
@@ -124,7 +124,7 @@ discouraged.
124
patch. This can be used to extract the common part between
125
two files by first running 'diff' on them and applying
126
the result with this option, which would apply the
127
- deletion part but not addition part.
127
+ deletion part but not the addition part.
128
129
--allow-binary-replacement::
130
--binary::
@@ -162,7 +162,7 @@ By default, the command outputs warning messages but applies the patch.
162
When `git-apply` is used for statistics and not applying a
163
patch, it defaults to `nowarn`.
164
+
165
-You can use different `<action>` to control this
165
+You can use different `<action>` values to control this
166
behavior:
167
+
168
* `nowarn` turns off the trailing whitespace warning.
@@ -170,7 +170,7 @@ behavior:
170
patch as-is (default).
171
* `fix` outputs warnings for a few such errors, and applies the
172
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
174
fix involved 'stripping' them, but modern gits do more).
175
* `error` outputs warnings for a few such errors, and refuses
176
to apply the patch.
@@ -195,7 +195,7 @@ behavior:
195
adjusting the hunk headers appropriately).
196
197
--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,
199
it is applied before prepending the new root.
200
+
201
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
221
are not updated.
222
223
If --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
225
subdirectory is checked and (if possible) updated.
226
227
Author