summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-23 18:48:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-23 18:48:14 -0800
commitb61971520738dbdc7ea2e46f8183dffe7fa4f48d (patch)
treefae72483e4e965d6a785cbea6777a47dc9bc2b04 /Documentation
parentRename diff.suppress-blank-empty to diff.suppressBlankEmpty (diff)
parentFix Documentation for git-describe (diff)
downloadtgif-b61971520738dbdc7ea2e46f8183dffe7fa4f48d.tar.xz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: Fix Documentation for git-describe
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-describe.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 3d79f05995..a30c5ac966 100644
--- 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>::