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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e452ff89ba1f2935d6b22d030251b04db48a3cef..91f37be12740631324ba0eeaa7f3b351b24b2e20 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -423,7 +423,7 @@ core.sharedRepository::
 
 core.warnAmbiguousRefs::
        If true, git will warn you if the ref name you passed it is ambiguous
 
 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.
 
 core.compression::
        An integer -1..9, indicating a default compression level.

diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 3bc1500eda540cf7277e602b3d0ade1a3c1dc1be..d59a5ad1acbaad0d543c79aa4c78c958c3baf296 100644 (file)
--- 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>*
 ---------------------------------------------
 $ 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
 
     --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::
 ---------------------------------------------
 
 --help-all::

diff --git a/builtin/describe.c b/builtin/describe.c
index 04c185b1fbdc51ba9958fdb83d1c6616bcb0c18e..ca084c675ef80deaac7a3f8615c1ea3329a97421 100644 (file)
--- 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")),
        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,
                OPT_BOOLEAN(0, "long",       &longformat, N_("always use long format")),
                OPT__ABBREV(&abbrev),
                OPT_SET_INT(0, "exact-match", &max_candidates,