summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-19 19:16:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-19 19:16:22 (GMT)
commit9adf272a38f3ac79c9f241dc348546fb0d5694ce (patch)
tree946c61f57cf3b0120f45dcb0d557767092137836 /builtin
parentc2bf648b84d3b61c4250f0e921a40b75d3e72cf8 (diff)
parent48dfe969fc703f1f77f8944bbef033e58b815634 (diff)
downloadgit-9adf272a38f3ac79c9f241dc348546fb0d5694ce.zip
git-9adf272a38f3ac79c9f241dc348546fb0d5694ce.tar.gz
git-9adf272a38f3ac79c9f241dc348546fb0d5694ce.tar.bz2
Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs'
* gp/avoid-explicit-mention-of-dot-git-refs: Fix ".git/refs" stragglers
Diffstat (limited to 'builtin')
-rw-r--r--builtin/describe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index 04c185b..ca084c6 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -402,8 +402,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT_BOOLEAN(0, "contains", &contains, N_("find the tag that comes after the commit")),
OPT_BOOLEAN(0, "debug", &debug, N_("debug search strategy on stderr")),
- OPT_BOOLEAN(0, "all", &all, N_("use any ref in .git/refs")),
- OPT_BOOLEAN(0, "tags", &tags, N_("use any tag in .git/refs/tags")),
+ OPT_BOOLEAN(0, "all", &all, N_("use any ref")),
+ OPT_BOOLEAN(0, "tags", &tags, N_("use any tag, even unannotated")),
OPT_BOOLEAN(0, "long", &longformat, N_("always use long format")),
OPT__ABBREV(&abbrev),
OPT_SET_INT(0, "exact-match", &max_candidates,