Merge branch 'rs/grep-h-c'

diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 3f33ca5507a7a4b61030b1ad04b37387d7abdb37..1c3e109cb3d30e69121f9b6681e870a66cf04609 100644 (file)
--- 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.