diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 03:55:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 03:55:45 +0300 |
| commit | 95173a566339e023666753c6382c5b3fd7484583 (patch) | |
| tree | e02475d4bcad0fbb4db319f367346fb0db9b62b0 /Documentation | |
| parent | 12435b377f4f2e49340be3361fcc8ee128337638 (diff) | |
| parent | fb87327aeed9c0079266e74b80d46b0119142601 (diff) | |
Merge branch 'ah/doc-rev-parse-short-default'
Doc update.
* ah/doc-rev-parse-short-default:
doc: rewrite description for rev-parse --short
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-rev-parse.txt | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 43d830ee3bb..3256a33448f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -883,6 +883,7 @@ core.abbrev:: computed based on the approximate number of packed objects in your repository, which hopefully is enough for abbreviated object names to stay unique for some time. + The minimum length is 4. add.ignoreErrors:: add.ignore-errors (deprecated):: diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index c40c4704486..b1293f24bb4 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -126,6 +126,12 @@ can be used. 'git diff-{asterisk}'). In contrast to the `--sq-quote` option, the command input is still interpreted as usual. +--short[=length]:: + Same as `--verify` but shortens the object name to a unique + prefix with at least `length` characters. The minimum length + is 4, the default is the effective value of the `core.abbrev` + configuration variable (see linkgit:git-config[1]). + --not:: When showing object names, prefix them with '{caret}' and strip '{caret}' prefix from the object names that already have @@ -136,12 +142,6 @@ can be used. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode. ---short:: ---short=number:: - Instead of outputting the full SHA-1 values of object names try to - abbreviate them to a shorter unique name. When no length is specified - 7 is used. The minimum length is 4. - --symbolic:: Usually the object names are output in SHA-1 form (with possible '{caret}' prefix); this option makes them output in a |