Fix ".git/refs" stragglers
A couple of references still survive to .git/refs as a tree of all refs. Fix one in docs, one in a -h message, one in a -h message quoted in docs. Signed-off-by: Greg Price <price@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Greg Price committed
Feb 25, 2013 at 00:34 UTC
48dfe969fc703f1f77f8944bbef033e58b815634
3 files changed
+8
-7
Documentation/config.txt
+1
-1
@@ -423,7 +423,7 @@ core.sharedRepository::
423
424
core.warnAmbiguousRefs::
425
If true, git will warn you if the ref name you passed it is ambiguous
426
- and might match multiple refs in the .git/refs/ tree. True by default.
426
+ and might match multiple refs in the repository. True by default.
427
428
core.compression::
429
An integer -1..9, indicating a default compression level.
Documentation/gitcli.txt
+5
-4
@@ -107,13 +107,14 @@ couple of magic command line options:
107
---------------------------------------------
108
$ git describe -h
109
usage: git describe [options] <committish>*
110
+ or: git describe [options] --dirty
111
112
--contains find the tag that comes after the commit
113
--debug debug search strategy on stderr
113
- --all use any ref in .git/refs
114
- --tags use any tag in .git/refs/tags
115
- --abbrev [<n>] use <n> digits to display SHA-1s
116
- --candidates <n> consider <n> most recent tags (default: 10)
114
+ --all use any ref
115
+ --tags use any tag, even unannotated
116
+ --long always use long format
117
+ --abbrev[=<n>] use <n> digits to display SHA-1s
118
---------------------------------------------
119
120
--help-all::
builtin/describe.c
+2
-2
@@ -402,8 +402,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
402
struct option options[] = {
403
OPT_BOOLEAN(0, "contains", &contains, N_("find the tag that comes after the commit")),
404
OPT_BOOLEAN(0, "debug", &debug, N_("debug search strategy on stderr")),
405
- OPT_BOOLEAN(0, "all", &all, N_("use any ref in .git/refs")),
406
- OPT_BOOLEAN(0, "tags", &tags, N_("use any tag in .git/refs/tags")),
405
+ OPT_BOOLEAN(0, "all", &all, N_("use any ref")),
406
+ OPT_BOOLEAN(0, "tags", &tags, N_("use any tag, even unannotated")),
407
OPT_BOOLEAN(0, "long", &longformat, N_("always use long format")),
408
OPT__ABBREV(&abbrev),
409
OPT_SET_INT(0, "exact-match", &max_candidates,