summaryrefslogtreecommitdiff
path: root/Documentation/gitcli.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-07 19:55:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-07 19:55:12 (GMT)
commitefe5f1d25d198ae8796b6f095c2cffae270bb9b6 (patch)
tree9b851ba1b50793afd5384d77a72b1d254a0ee9c7 /Documentation/gitcli.txt
parentc256661bbe09c842f7b6fe24986294d611f25200 (diff)
parent5fe8f49b6d59cf143a5898ddbb161444a95fa871 (diff)
downloadgit-efe5f1d25d198ae8796b6f095c2cffae270bb9b6.zip
git-efe5f1d25d198ae8796b6f095c2cffae270bb9b6.tar.gz
git-efe5f1d25d198ae8796b6f095c2cffae270bb9b6.tar.bz2
Merge branch 'ow/manpages-typofix'
Various typofixes, all looked correct. * ow/manpages-typofix: Documentation: fix typos in man pages
Diffstat (limited to 'Documentation/gitcli.txt')
-rw-r--r--Documentation/gitcli.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 3f33ca5..1c3e109 100644
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -28,7 +28,7 @@ arguments. Here are the rules:
they can be disambiguated by placing `--` between them.
E.g. `git diff -- HEAD` is, "I have a file called HEAD in my work
tree. Please show changes between the version I staged in the index
- and what I have in the work tree for that file". not "show difference
+ and what I have in the work tree for that file", not "show difference
between the HEAD commit and the work tree as a whole". You can say
`git diff HEAD --` to ask for the latter.