diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-26 19:40:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-26 19:40:04 (GMT) |
| commit | c17866d7b693771e558d972b52d786c29e7ddd76 (patch) | |
| tree | 19bea4e03f0bdfc143c0afa8564fda620ded3d1f /Documentation | |
| parent | 1d663835799f4c654fd46733e04fbaaaa0baf63a (diff) | |
| parent | 48dfe969fc703f1f77f8944bbef033e58b815634 (diff) | |
| download | git-c17866d7b693771e558d972b52d786c29e7ddd76.zip git-c17866d7b693771e558d972b52d786c29e7ddd76.tar.gz git-c17866d7b693771e558d972b52d786c29e7ddd76.tar.bz2 | |
Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint
* gp/avoid-explicit-mention-of-dot-git-refs:
Fix ".git/refs" stragglers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitcli.txt | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bbba728..b3023b8 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 dc9e617..9ac5088 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:: |