Merge branch 'sb/describe-long'

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

diff --cc Documentation/git-describe.txt
Simple merge

diff --cc builtin-describe.c
index 05e309f5ad15f9a6f85df34322bb59152b4e37be,3fd2e7371f2b685d4dd5868c5b3294b224c9d4f0..2342913df622f6759fd45b58e5ee2899ade9fbfb
--- 1/builtin-describe.c
--- 2/builtin-describe.c
+++ b/builtin-describe.c
@@@ -271,9 -259,8 +276,10 @@@ int cmd_describe(int argc, const char *
                OPT_BOOLEAN(0, "debug",      &debug, "debug search strategy on stderr"),
                OPT_BOOLEAN(0, "all",        &all, "use any ref in .git/refs"),
                OPT_BOOLEAN(0, "tags",       &tags, "use any tag in .git/refs/tags"),
+               OPT_BOOLEAN(0, "long",       &longformat, "always use long format"),
                OPT__ABBREV(&abbrev),
 +              OPT_SET_INT(0, "exact-match", &max_candidates,
 +                          "only output exact matches", 0),
                OPT_INTEGER(0, "candidates", &max_candidates,
                            "consider <n> most recent tags (default: 10)"),
                OPT_STRING(0, "match",       &pattern, "pattern",