summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Cesar Eduardo Barros <cesarb@cesarb.net>2008-07-26 21:46:00 -0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-30 00:19:22 -0700
commit81b237d5db946b4196225712a37639952787c959 (patch)
treeb79fcc3ea2c082fae355265c5c29823b067675b3
parentMerge git://repo.or.cz/git-gui (diff)
downloadtgif-81b237d5db946b4196225712a37639952787c959.tar.xz
Documentation/git-rev-parse.txt: update for new git-describe output format
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-rev-parse.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 5c936693d3..2921da320d 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -155,8 +155,9 @@ blobs contained in a commit.
name the same commit object if there are no other object in
your repository whose object name starts with dae86e.
-* An output from 'git-describe'; i.e. a closest tag, followed by a
- dash, a `g`, and an abbreviated object name.
+* An output from 'git-describe'; i.e. a closest tag, optionally
+ followed by a dash and a number of commits, followed by a dash, a
+ `g`, and an abbreviated object name.
* A symbolic ref name. E.g. 'master' typically means the commit
object referenced by $GIT_DIR/refs/heads/master. If you