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-format-patch.html | |
parent | a65c1f44a0fb82bf498be0911b85fa42bb70147f (diff) | |
download | git-htmldocs-ee43d18844df1f78dad8b389cbb393b211073d17.tar.gz |
Autogenerated HTML docs for v2.29.2-260-ge31ab
Diffstat (limited to 'git-format-patch.html')
-rw-r--r-- | git-format-patch.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-format-patch.html b/git-format-patch.html index ea9c45ec6..c38f77e9c 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -853,7 +853,7 @@ reference.</p></div> <dd>
<p>
Generate diffs with <n> lines of context instead of
- the usual three. Implies <code>--patch</code>.
+ the usual three.
</p>
</dd>
<dt class="hdlist1">
@@ -1183,7 +1183,7 @@ and accumulating child directory counts in the parent directories: <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>.
</p>
</dd>
<dt class="hdlist1">
@@ -1193,7 +1193,8 @@ and accumulating child directory counts in the parent directories: <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>.
|