summaryrefslogtreecommitdiffstats
path: root/git-diff-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-31 16:16:35 -0700
committerJunio C Hamano <gitster@pobox.com>2020-08-31 16:16:35 -0700
commitcf8aeaf7e987e73615910d6961e38f20a8b0b550 (patch)
tree164cec121c10fbb4824768577408ce4bca9855bf /git-diff-tree.html
parentc0926523a55c2dd1314deb3281dabb03b2d5f965 (diff)
downloadgit-htmldocs-cf8aeaf7e987e73615910d6961e38f20a8b0b550.tar.gz
Autogenerated HTML docs for v2.28.0-394-ge1971
Diffstat (limited to 'git-diff-tree.html')
-rw-r--r--git-diff-tree.html9
1 files changed, 5 insertions, 4 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html
index ae0fed974..c93e7223d 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1513,10 +1513,11 @@ override configuration settings.</p></div>
<p>
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. This is
- independent of the <code>--full-index</code> option above, which controls
- the diff-patch output format. Non default number of
- digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
+ lines, show only a partial prefix.
+ In diff-patch output format, <code>--full-index</code> takes higher
+ precedence, i.e. if <code>--full-index</code> is specified, full blob
+ names will be shown regardless of <code>--abbrev</code>.
+ Non default number of digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
</p>
</dd>
<dt class="hdlist1">