Merge branch 'rh/merge-options-doc-fix'

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index f8c06013f3588a96e66d08265afe8131f054b7ff..a7b46208f62c81b63ef4b8fdc5cf3ac67bd8b541 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -25,7 +25,7 @@ between two files on disk.
 
        This form is to view the changes you made relative to
        the index (staging area for the next commit).  In other
-       words, the differences are what you _could_ tell git to
+       words, the differences are what you _could_ tell Git to
        further add to the index but you still haven't.  You can
        stage these changes by using linkgit:git-add[1].
 +