Skip to content

Commit

Permalink
Documentation: minor grammatical fixes.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David J. Mellor authored and Junio C Hamano committed Mar 2, 2009
1 parent a7d64b5 commit 1d035f8
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions Documentation/git-apply.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ and a work tree.
OPTIONS
-------
<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.

--stat::
Instead of applying the patch, output diffstat for the
input. Turns off "apply".

--numstat::
Similar to \--stat, but shows number of added and
deleted lines in decimal notation and pathname without
Similar to \--stat, but shows the number of added and
deleted lines in decimal notation and the pathname without
abbreviation, to make it more machine friendly. For
binary files, outputs two `-` instead of saying
`0 0`. Turns off "apply".
Expand All @@ -60,15 +60,15 @@ OPTIONS
causes the index file to be updated.

--cached::
Apply a patch without touching the working tree. Instead, take the
cached data, apply the patch, and store the result in the index,
Apply a patch without touching the working tree. Instead take the
cached data, apply the patch, and store the result in the index
without using the working tree. This implies '--index'.

--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 versions of the blobs is available locally,
the original versions of the blobs are available locally,
builds a temporary index containing those blobs.
+
When a pure mode change is encountered (which has no index information),
Expand Down Expand Up @@ -109,13 +109,13 @@ the information is read from the current index instead.
applying a diff generated with --unified=0. To bypass these
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.

--apply::
If you use any of the options marked "Turns off
'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
the patch.

Expand All @@ -124,7 +124,7 @@ discouraged.
patch. This can be used to extract the common part between
two files by first running 'diff' on them and applying
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::
--binary::
Expand Down Expand Up @@ -162,15 +162,15 @@ By default, the command outputs warning messages but applies the patch.
When `git-apply` is used for statistics and not applying a
patch, it defaults to `nowarn`.
+
You can use different `<action>` to control this
You can use different `<action>` values to control this
behavior:
+
* `nowarn` turns off the trailing whitespace warning.
* `warn` outputs warnings for a few such errors, but applies the
patch as-is (default).
* `fix` outputs warnings for a few such errors, and applies the
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).
* `error` outputs warnings for a few such errors, and refuses
to apply the patch.
Expand All @@ -195,7 +195,7 @@ behavior:
adjusting the hunk headers appropriately).

--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.
+
For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh`
Expand All @@ -221,7 +221,7 @@ ignored, i.e., they are not required to be up-to-date or clean and they
are not updated.

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.

Author
Expand Down

0 comments on commit 1d035f8

Please sign in to comment.