diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-11 14:10:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 14:10:41 -0800 |
| commit | ee43d18844df1f78dad8b389cbb393b211073d17 (patch) | |
| tree | 7f6be6f8062026ad72363aa7f030ab774761f597 /git-diff-tree.html | |
| parent | a65c1f44a0fb82bf498be0911b85fa42bb70147f (diff) | |
| download | git-htmldocs-ee43d18844df1f78dad8b389cbb393b211073d17.tar.gz | |
Autogenerated HTML docs for v2.29.2-260-ge31ab
Diffstat (limited to 'git-diff-tree.html')
| -rw-r--r-- | git-diff-tree.html | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html index e9dabadc5..e3a330592 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -804,8 +804,8 @@ git-diff-tree(1) Manual Page <dd>
<p>
Generate diffs with <n> lines of context instead of
- the usual three. Implies <code>--patch</code>.
- Implies <code>-p</code>.
+ the usual three.
+ Implies <code>--patch</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1503,7 +1503,8 @@ override configuration settings.</p></div> <dd>
<p>
In addition to <code>--full-index</code>, output a binary diff that
- can be applied with <code>git-apply</code>. Implies <code>--patch</code>.
+ can be applied with <code>git-apply</code>.
+ Implies <code>--patch</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1513,7 +1514,8 @@ 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.
+ lines, show the shortest prefix that is at least <em><n></em>
+ hexdigits long that uniquely refers the object.
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>.
@@ -2147,9 +2149,9 @@ configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> <dd>
<p>
Instead of showing the full 40-byte hexadecimal commit object
- name, show only a partial prefix. Non default number of
- digits can be specified with "--abbrev=<n>" (which also modifies
- diff output, if it is displayed).
+ name, show a prefix that names the object uniquely.
+ "--abbrev=<n>" (which also modifies diff output, if it is displayed)
+ option can be used to specify the minimum length of the prefix.
</p>
<div class="paragraph"><p>This should make "--pretty=oneline" a whole lot more readable for
people using 80-column terminals.</p></div>
|