summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-24 23:24:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-24 23:24:21 (GMT)
commita5ee8faaee15d2f53de3bd182550f506a3162fbe (patch)
tree332bf3614cf979408d6191ab9ab7cebac420323d
parent4503bd5c3732b142667e14d214c21c46e8f3eeaa (diff)
parent0476228de500049804ae599f557658c3f9042ad0 (diff)
downloadgit-a5ee8faaee15d2f53de3bd182550f506a3162fbe.zip
git-a5ee8faaee15d2f53de3bd182550f506a3162fbe.tar.gz
git-a5ee8faaee15d2f53de3bd182550f506a3162fbe.tar.bz2
Merge branch 'maint'
* maint: Documentation: explain the meaning of "-g" in git-describe output
-rw-r--r--Documentation/git-describe.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 6fc5323..7ef9d51 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -105,6 +105,9 @@ The number of additional commits is the number
of commits which would be displayed by "git log v1.0.4..parent".
The hash suffix is "-g" + 7-char abbreviation for the tip commit
of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`).
+The "g" prefix stands for "git" and is used to allow describing the version of
+a software depending on the SCM the software is managed with. This is useful
+in an environment where people may use different SCMs.
Doing a 'git describe' on a tag-name will just show the tag name: