summaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
diff options
context:
space:
mode:
authorThomas Ackermann <th.acker@arcor.de>2013-01-21 19:17:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-01 21:53:33 (GMT)
commit2de9b71138171dca7279db3b3fe67e868c76d921 (patch)
tree09cc74f510322f4f1241cd11a374490bc32d5aa3 /Documentation/git-apply.txt
parent48a8c26c625a4d3631c4f614bceb38933e741408 (diff)
downloadgit-2de9b71138171dca7279db3b3fe67e868c76d921.zip
git-2de9b71138171dca7279db3b3fe67e868c76d921.tar.gz
git-2de9b71138171dca7279db3b3fe67e868c76d921.tar.bz2
Documentation: the name of the system is 'Git', not 'git'
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r--Documentation/git-apply.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 634b84e..f605327 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -24,7 +24,7 @@ Reads the supplied diff output (i.e. "a patch") and applies it to files.
With the `--index` option the patch is also applied to the index, and
with the `--cached` option the patch is only applied to the index.
Without these options, the command applies the patch only to files,
-and does not require them to be in a git repository.
+and does not require them to be in a Git repository.
This command applies the patch but does not create a commit. Use
linkgit:git-am[1] to create commits from patches generated by
@@ -198,7 +198,7 @@ behavior:
* `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 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
to apply the patch.
* `error-all` is similar to `error` but shows all errors.