Merge branch 'maint-1.6.0' into maint

* maint-1.6.0: Fix Documentation for git-describe
2009-01-23 18:48:14 -08:00 · 2009-01-23 18:48:14 -08:00 · b619715207
commit b619715207
parent 950db8798d b938f62a20
1 changed files with 1 additions and 1 deletions
--- 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>::