summaryrefslogtreecommitdiff
path: root/Documentation/git-describe.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-14 20:46:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-14 20:46:42 (GMT)
commita473445ac256f4a6ca5c66f83f33b85eec0e0c48 (patch)
tree8e4ef2d080a93b1e120ff172ff3d4b97deb8c076 /Documentation/git-describe.txt
parent3e08f5db65bcfe3ad238ee0de1cac2da84953cf3 (diff)
parentb7893cde53eb2834deb16820eccb709d2636b81b (diff)
downloadgit-a473445ac256f4a6ca5c66f83f33b85eec0e0c48.zip
git-a473445ac256f4a6ca5c66f83f33b85eec0e0c48.tar.gz
git-a473445ac256f4a6ca5c66f83f33b85eec0e0c48.tar.bz2
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: Documentation/git-describe.txt: make description more readable
Diffstat (limited to 'Documentation/git-describe.txt')
-rw-r--r--Documentation/git-describe.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index d9aa2f2..69e1ab7 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -13,9 +13,10 @@ SYNOPSIS
DESCRIPTION
-----------
The command finds the most recent tag that is reachable from a
-commit, and if the commit itself is pointed at by the tag, shows
-the tag. Otherwise, it suffixes the tag name with the number of
-additional commits and the abbreviated object name of the commit.
+commit. If the tag points to the commit, then only the tag is
+shown. Otherwise, it suffixes the tag name with the number of
+additional commits on top of the tagged object and the
+abbreviated object name of the most recent commit.
OPTIONS