From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Jan 2009 05:51:20 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.2-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Fix Documentation for git-describe
---

f3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d
diff --combined Documentation/git-describe.txt
index a99b4ef943,a30c5ac966..b231dbb947
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@@ -43,7 -43,7 +43,7 @@@ OPTION
  	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>::
@@@ -87,7 -87,7 +87,7 @@@ With something like git.git current tre
  	v1.0.4-14-g2414721
  
  i.e. the current head of my "parent" branch is based on v1.0.4,
 -but since it has a handful commits on top of that,
 +but since it has a few commits on top of that,
  describe has added the number of additional commits ("14") and
  an abbreviated object name for the commit itself ("2414721")
  at the end.