Merge branch 'maint-1.6.0' into maint

diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 3d79f05995d28214f68640dd3f693033dff03547..a30c5ac96618f5010388edd66815ec97971a92e0 100644 (file)
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -43,7 +43,7 @@ OPTIONS
        Automatically implies --tags.
 
 --abbrev=<n>::
-       Instead of using the default 8 hexadecimal digits as the
+       Instead of using the default 7 hexadecimal digits as the
        abbreviated object name, use <n> digits.
 
 --candidates=<n>::