summaryrefslogtreecommitdiffstats
path: root/git-diff-files.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-11 14:10:41 -0800
committerJunio C Hamano <gitster@pobox.com>2020-11-11 14:10:41 -0800
commitee43d18844df1f78dad8b389cbb393b211073d17 (patch)
tree7f6be6f8062026ad72363aa7f030ab774761f597 /git-diff-files.html
parenta65c1f44a0fb82bf498be0911b85fa42bb70147f (diff)
downloadgit-htmldocs-ee43d18844df1f78dad8b389cbb393b211073d17.tar.gz
Autogenerated HTML docs for v2.29.2-260-ge31ab
Diffstat (limited to 'git-diff-files.html')
-rw-r--r--git-diff-files.html10
1 files changed, 6 insertions, 4 deletions
diff --git a/git-diff-files.html b/git-diff-files.html
index d8bd8fe67..e4df7fa43 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -802,8 +802,8 @@ same as for <em>git diff-index</em> and <em>git diff-tree</em>.</p></div>
<dd>
<p>
Generate diffs with &lt;n&gt; 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">
@@ -1501,7 +1501,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">
@@ -1511,7 +1512,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>&lt;n&gt;</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>.