diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:40:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:40:15 -0700 |
| commit | ad77690fe400d91d3da97e16c07f1a8591b19b99 (patch) | |
| tree | 6b6264e1b76b1afc438856473ca45ad052a99b0c /Documentation/git-describe.txt | |
| parent | c6c4d616739b531b5689b78fbcb2c89d14e70a4f (diff) | |
| parent | 57148ebb30fd7ed72acf7b3fc6f59d7cf2d94643 (diff) | |
| download | git-ad77690fe400d91d3da97e16c07f1a8591b19b99.tar.gz | |
Merge branch 'ta/glossary'
* ta/glossary:
glossary: improve definitions of refspec and pathspec
The name of the hash function is "SHA-1", not "SHA1"
glossary: improve description of SHA-1 related topics
glossary: remove outdated/misleading/irrelevant entries
Diffstat (limited to 'Documentation/git-describe.txt')
| -rw-r--r-- | Documentation/git-describe.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index 3c81e85ec5..28e5ec0e2c 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -149,7 +149,7 @@ is found, its name will be output and searching will stop. If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an -abbreviation of the input committish's SHA1. +abbreviation of the input committish's SHA-1. If multiple tags were found during the walk then the tag which has the fewest commits different from the input committish will be |