diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:23 +0900 |
| commit | 478d3c35b020c3d3512769ca5bd46c8e1c167884 (patch) | |
| tree | 944f0da8855608c1d0504bdc8015adb54d584b73 | |
| parent | f166aab8bf877d7448f5bc7257fd43db66983a55 (diff) | |
| parent | fb87327aeed9c0079266e74b80d46b0119142601 (diff) | |
| download | git-478d3c35b020c3d3512769ca5bd46c8e1c167884.tar.gz | |
Merge branch 'ah/doc-rev-parse-short-default' into maint
Doc update.
* ah/doc-rev-parse-short-default:
doc: rewrite description for rev-parse --short
| -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 3623b5014f..a6a589a735 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -873,6 +873,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 c40c470448..b1293f24bb 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 |