diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:38 -0800 |
| commit | ee13bebbd50f69ac593f3e87a0958045f38edf6d (patch) | |
| tree | d6d503ce21241381463165ab0fa314562063647b /Documentation/diff-options.txt | |
| parent | 15486b65d033fa3342ca8334ca8fa4c7ecba9a78 (diff) | |
| parent | cda34e0d0cc3e0b53e6c496c56e07e34c339263f (diff) | |
| download | git-ee13bebbd50f69ac593f3e87a0958045f38edf6d.tar.gz | |
Merge branch 'jc/abbrev-doc'
The documentation on the "--abbrev=<n>" option did not say the
output may be longer than "<n>" hexdigits, which has been
clarified.
* jc/abbrev-doc:
doc: clarify that --abbrev=<n> is about the minimum length
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c7f1f2f0ac..2e7a93894c 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -449,7 +449,8 @@ endif::git-format-patch[] --abbrev[=<n>]:: Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only a partial prefix. + lines, show the shortest prefix that is at least '<n>' + hexdigits long that uniquely refers the object. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. |