Merge branch 'sb/describe-long'

* sb/describe-long:
  git-describe: --long shows the object name even for a tagged commit

1 files changed, 9 insertions, 0 deletions

diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index fbb40a2916..d9aa2f2980 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -56,6 +56,15 @@ OPTIONS
 	being employed to standard error.  The tag name will still
 	be printed to standard out.
 
+--long::
+	Always output the long format (the tag, the number of commits
+	and the abbreviated commit name) even when it matches a tag.
+	This is useful when you want to see parts of the commit object name
+	in "describe" output, even when the commit in question happens to be
+	a tagged version.  Instead of just emitting the tag name, it will
+	describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2
+	that points at object deadbeef....).
+
 --match <pattern>::
 	Only consider tags matching the given pattern (can be used to avoid
 	leaking private tags made from the repository).