Merge branch 'maint-1.6.0' into maint

* maint-1.6.0: Fix Documentation for git-describe
electrum · Jan 24, 2009 · b619715 · b619715
2 parents 950db87 + b938f62
commit b619715
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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>::