Merge branch 'maint-1.6.0' into maint

gitster · gitster · commit b61971520738 · 2009-01-23T18:48:14.000-08:00
* maint-1.6.0:
  Fix Documentation for git-describe
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>::
