Merge branch 'maint'

diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index a99b4ef9434f11d46cecbd80cca9548866c1aa48..b231dbb947791bb4fc5cde552e8c736b3558ca0a 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>::