Merge branch 'jc/color-diff-doc'

diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index e3c84486141685e2f128f64f46d24c36cc45e97f..e93fcb49fdca2d5e7987e10b5234c3d216fb47d6 100644 (file)
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
@@ -34,7 +34,7 @@ OPTIONS
 -k::
         Skip move or rename actions which would lead to an error
        condition. An error happens when a source is neither existing nor
-        controlled by GIT, or when it would overwrite an existing
+       controlled by Git, or when it would overwrite an existing
         file unless '-f' is given.
 -n::
 --dry-run::