undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs'

Browse Source 
* gp/avoid-explicit-mention-of-dot-git-refs:
  Fix ".git/refs" stragglers
This commit is contained in:
Junio C Hamano 2013-03-19 12:16:22 -07:00
commit 9adf272a38
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -443,7 +443,7 @@ core.sharedRepository::
core.warnAmbiguousRefs:: core.warnAmbiguousRefs::
If true, Git will warn you if the ref name you passed it is ambiguous 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:: core.compression::
An integer -1..9, indicating a default compression level. An integer -1..9, indicating a default compression level.

9
Documentation/gitcli.txt
View File

@ -107,13 +107,14 @@ couple of magic command line options:
--------------------------------------------- ---------------------------------------------
$ git describe -h $ git describe -h
usage: git describe [options] <committish>* usage: git describe [options] <committish>*
or: git describe [options] --dirty
--contains find the tag that comes after the commit --contains find the tag that comes after the commit
--debug debug search strategy on stderr --debug debug search strategy on stderr
--all use any ref in .git/refs --all use any ref
--tags use any tag in .git/refs/tags --tags use any tag, even unannotated
--abbrev [<n>] use <n> digits to display SHA-1s --long always use long format
--candidates <n> consider <n> most recent tags (default: 10) --abbrev[=<n>] use <n> digits to display SHA-1s
--------------------------------------------- ---------------------------------------------
--help-all:: --help-all::

4
builtin/describe.c
View File

@ -402,8 +402,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
struct option options[] = { struct option options[] = {
OPT_BOOLEAN(0, "contains", &contains, N_("find the tag that comes after the commit")), 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, "debug", &debug, N_("debug search strategy on stderr")),
OPT_BOOLEAN(0, "all", &all, N_("use any ref in .git/refs")), OPT_BOOLEAN(0, "all", &all, N_("use any ref")),
OPT_BOOLEAN(0, "tags", &tags, N_("use any tag in .git/refs/tags")), OPT_BOOLEAN(0, "tags", &tags, N_("use any tag, even unannotated")),
OPT_BOOLEAN(0, "long", &longformat, N_("always use long format")), OPT_BOOLEAN(0, "long", &longformat, N_("always use long format")),
OPT__ABBREV(&abbrev), OPT__ABBREV(&abbrev),
OPT_SET_INT(0, "exact-match", &max_candidates, OPT_SET_INT(0, "exact-match", &max_candidates,