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

* gp/avoid-explicit-mention-of-dot-git-refs:
  Fix ".git/refs" stragglers
This commit is contained in:
Junio C Hamano
2013-03-26 12:40:04 -07:00
3 changed files with 8 additions and 7 deletions

View File

@ -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.

View File

@ -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::