diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:16:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:16:22 -0700 |
| commit | 9adf272a38f3ac79c9f241dc348546fb0d5694ce (patch) | |
| tree | 946c61f57cf3b0120f45dcb0d557767092137836 | |
| parent | c2bf648b84d3b61c4250f0e921a40b75d3e72cf8 (diff) | |
| parent | 48dfe969fc703f1f77f8944bbef033e58b815634 (diff) | |
| download | git-9adf272a38f3ac79c9f241dc348546fb0d5694ce.tar.gz git-9adf272a38f3ac79c9f241dc348546fb0d5694ce.tar.xz | |
Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs'
* gp/avoid-explicit-mention-of-dot-git-refs:
Fix ".git/refs" stragglers
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitcli.txt | 9 | ||||
| -rw-r--r-- | builtin/describe.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bbba728d0..b3023b817 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -443,7 +443,7 @@ core.sharedRepository:: core.warnAmbiguousRefs:: If true, Git will warn you if the ref name you passed it is ambiguous - and might match multiple refs in the .git/refs/ tree. True by default. + and might match multiple refs in the repository. True by default. core.compression:: An integer -1..9, indicating a default compression level. diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index dc9e617a1..9ac5088ac 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -107,13 +107,14 @@ couple of magic command line options: --------------------------------------------- $ git describe -h usage: git describe [options] <committish>* + or: git describe [options] --dirty --contains find the tag that comes after the commit --debug debug search strategy on stderr - --all use any ref in .git/refs - --tags use any tag in .git/refs/tags - --abbrev [<n>] use <n> digits to display SHA-1s - --candidates <n> consider <n> most recent tags (default: 10) + --all use any ref + --tags use any tag, even unannotated + --long always use long format + --abbrev[=<n>] use <n> digits to display SHA-1s --------------------------------------------- --help-all:: diff --git a/builtin/describe.c b/builtin/describe.c index 04c185b1f..ca084c675 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, |