diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-26 12:40:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-26 12:40:04 -0700 |
| commit | c17866d7b693771e558d972b52d786c29e7ddd76 (patch) | |
| tree | 19bea4e03f0bdfc143c0afa8564fda620ded3d1f /builtin | |
| parent | 1d663835799f4c654fd46733e04fbaaaa0baf63a (diff) | |
| parent | 48dfe969fc703f1f77f8944bbef033e58b815634 (diff) | |
| download | git-c17866d7b693771e558d972b52d786c29e7ddd76.tar.gz | |
Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint
* gp/avoid-explicit-mention-of-dot-git-refs:
Fix ".git/refs" stragglers
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/describe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 04c185b1fb..ca084c675e 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, |