Autogenerated HTML docs for v2.29.2-260-ge31ab

1 files changed, 6 insertions, 4 deletions

diff --git a/git-diff.html b/git-diff.html
index 43ae255b3..f6e217eed 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -933,8 +933,8 @@ and the range notations (<code>&lt;commit&gt;..&lt;commit&gt;</code> and
 <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">

@@ -1636,7 +1636,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">

@@ -1646,7 +1647,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>.