Autogenerated HTML docs for v2.29.2-260-ge31ab

40 files changed, 138 insertions, 87 deletions

diff --git a/RelNotes/2.30.0.txt b/RelNotes/2.30.0.txt
index 76ae487fe..defa865a6 100644
--- a/RelNotes/2.30.0.txt
+++ b/RelNotes/2.30.0.txt
@@ -167,6 +167,21 @@ Fixes since v2.29
  * A recent oid->hash conversion missed one spot, breaking "git svn".
    (merge 03bb366de4 bc/svn-hash-oid-fix later to maint).
 
+ * The documentation on the "--abbrev=<n>" option did not say the
+   output may be longer than "<n>" hexdigits, which has been
+   clarified.
+   (merge cda34e0d0c jc/abbrev-doc later to maint).
+
+ * "git p4" now honors init.defaultBranch configuration.
+   (merge 1b09d1917f js/p4-default-branch later to maint).
+
+ * Recently the format of an internal state file "rebase -i" uses has
+   been tightened up for consistency, which would hurt those who start
+   "rebase -i" with old git and then continue with new git.  Loosen
+   the reader side a bit (which we may want to tighten again in a year
+   or so).
+   (merge c779386182 jc/sequencer-stopped-sha-simplify later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint).
    (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint).
@@ -177,3 +192,10 @@ Fixes since v2.29
    (merge 9a82db1056 en/sequencer-rollback-lock-cleanup later to maint).
    (merge 4e1bee9a99 js/t7006-cleanup later to maint).
    (merge f5bcde6c58 es/tutorial-mention-asciidoc-early later to maint).
+   (merge 714d491af0 so/format-patch-doc-on-default-diff-format later to maint).
+   (merge 0795df4b9b rs/clear-commit-marks-in-repo later to maint).
+   (merge 9542d56379 sd/prompt-local-variable later to maint).
+   (merge 06d43fad18 rs/pack-write-hashwrite-simplify later to maint).
+   (merge b7e20b4373 mc/typofix later to maint).
+   (merge f6bcd9a8a4 js/test-whitespace-fixes later to maint).
+   (merge 53b67a801b js/test-file-size later to maint).
diff --git a/config.txt b/config.txt
index 025ca4df1..f292c2689 100644
--- a/config.txt
+++ b/config.txt
@@ -265,7 +265,7 @@ color::
 The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
 `blue`, `magenta`, `cyan` and `white`.  The first color given is the
 foreground; the second is the background.  All the basic colors except
-`normal` have a bright variant that can be speficied by prefixing the
+`normal` have a bright variant that can be specified by prefixing the
 color with `bright`, like `brightred`.
 +
 Colors may also be given as numbers between 0 and 255; these use ANSI
diff --git a/diff-options.txt b/diff-options.txt
index ee52b65e4..2e7a93894 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -36,9 +36,9 @@ endif::git-format-patch[]
 -U<n>::
 --unified=<n>::
 	Generate diffs with <n> lines of context instead of
-	the usual three. Implies `--patch`.
+	the usual three.
 ifndef::git-format-patch[]
-	Implies `-p`.
+	Implies `--patch`.
 endif::git-format-patch[]
 
 --output=<file>::
@@ -441,12 +441,16 @@ endif::git-format-patch[]
 
 --binary::
 	In addition to `--full-index`, output a binary diff that
-	can be applied with `git-apply`. Implies `--patch`.
+	can be applied with `git-apply`.
+ifndef::git-format-patch[]
+	Implies `--patch`.
+endif::git-format-patch[]
 
 --abbrev[=<n>]::
 	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 '<n>'
+	hexdigits long that uniquely refers the object.
 	In diff-patch output format, `--full-index` takes higher
 	precedence, i.e. if `--full-index` is specified, full blob
 	names will be shown regardless of `--abbrev`.
diff --git a/git-blame.html b/git-blame.html
index d252a0be3..94c40493c 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -1151,7 +1151,9 @@ take effect.</p></div>
 <dd>

 <p>

         Instead of using the default 7+1 hexadecimal digits as the

-        abbreviated object name, use &lt;n&gt;+1 digits. Note that 1 column

+        abbreviated object name, use &lt;m&gt;+1 digits, where &lt;m&gt; is at

+        least &lt;n&gt; but ensures the commit object names are unique.

+        Note that 1 column

         is used for a caret to mark the boundary commit.

 </p>

 </dd>

@@ -1443,7 +1445,7 @@ the email address.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 08:03:13 PDT

+ 2020-11-11 14:07:52 PST

 </div>

 </div>

 </body>

diff --git a/git-blame.txt b/git-blame.txt
index 7e8154199..34b496d48 100644
--- a/git-blame.txt
+++ b/git-blame.txt
@@ -87,7 +87,9 @@ include::blame-options.txt[]
 
 --abbrev=<n>::
 	Instead of using the default 7+1 hexadecimal digits as the
-	abbreviated object name, use <n>+1 digits. Note that 1 column
+	abbreviated object name, use <m>+1 digits, where <m> is at
+	least <n> but ensures the commit object names are unique.
+	Note that 1 column
 	is used for a caret to mark the boundary commit.
 
 
diff --git a/git-branch.html b/git-branch.html
index 3f833f78b..fe4873b11 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -750,7 +750,7 @@ git-branch(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>git branch</em> [--color[=&lt;when&gt;] | --no-color] [--show-current]

-        [-v [--abbrev=&lt;length&gt; | --no-abbrev]]

+        [-v [--abbrev=&lt;n&gt; | --no-abbrev]]

         [--column[=&lt;options&gt;] | --no-column] [--sort=&lt;key&gt;]

         [--merged [&lt;commit&gt;]] [--no-merged [&lt;commit&gt;]]

         [--contains [&lt;commit&gt;]] [--no-contains [&lt;commit&gt;]]

@@ -1044,11 +1044,13 @@ way to clean up all obsolete remote-tracking branches.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---abbrev=&lt;length&gt;

+--abbrev=&lt;n&gt;

 </dt>

 <dd>

 <p>

-        Alter the sha1&#8217;s minimum display length in the output listing.

+        In the verbose listing that show the commit object name,

+        show the shortest prefix that is at least <em>&lt;n&gt;</em> hexdigits

+        long that uniquely refers the object.

         The default value is 7 and can be overridden by the <code>core.abbrev</code>

         config option.

 </p>

@@ -1395,7 +1397,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-09-22 13:11:20 PDT

+ 2020-11-11 14:07:52 PST

 </div>

 </div>

 </body>

diff --git a/git-branch.txt b/git-branch.txt
index ace4ad3da..adaa1782a 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git branch' [--color[=<when>] | --no-color] [--show-current]
-	[-v [--abbrev=<length> | --no-abbrev]]
+	[-v [--abbrev=<n> | --no-abbrev]]
 	[--column[=<options>] | --no-column] [--sort=<key>]
 	[--merged [<commit>]] [--no-merged [<commit>]]
 	[--contains [<commit>]] [--no-contains [<commit>]]
@@ -194,8 +194,10 @@ This option is only applicable in non-verbose mode.
 	Be more quiet when creating or deleting a branch, suppressing
 	non-error messages.
 
---abbrev=<length>::
-	Alter the sha1's minimum display length in the output listing.
+--abbrev=<n>::
+	In the verbose listing that show the commit object name,
+	show the shortest prefix that is at least '<n>' hexdigits
+	long that uniquely refers the object.
 	The default value is 7 and can be overridden by the `core.abbrev`
 	config option.
 
diff --git a/git-config.html b/git-config.html
index 0972539db..3f507383a 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1749,7 +1749,7 @@ color
 <div class="paragraph"><p>The basic colors accepted are <code>normal</code>, <code>black</code>, <code>red</code>, <code>green</code>, <code>yellow</code>,

 <code>blue</code>, <code>magenta</code>, <code>cyan</code> and <code>white</code>.  The first color given is the

 foreground; the second is the background.  All the basic colors except

-<code>normal</code> have a bright variant that can be speficied by prefixing the

+<code>normal</code> have a bright variant that can be specified by prefixing the

 color with <code>bright</code>, like <code>brightred</code>.</p></div>

 <div class="paragraph"><p>Colors may also be given as numbers between 0 and 255; these use ANSI

 256-color mode (but note that not all terminals may support this).  If

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>.

diff --git a/git-diff-index.html b/git-diff-index.html
index fa2765926..6aab64ae4 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -803,8 +803,8 @@ files are compared.</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">

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

@@ -1512,7 +1513,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>.

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 &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">

@@ -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>&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>.

@@ -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=&lt;n&gt;" (which also modifies

-        diff output, if it is displayed).

+        name, show a prefix that names the object uniquely.

+        "--abbrev=&lt;n&gt;" (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>

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>.

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 &lt;n&gt; 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>&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>.

diff --git a/git-log.html b/git-log.html
index a780090bf..d2b48dcc5 100644
--- a/git-log.html
+++ b/git-log.html
@@ -2107,9 +2107,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=&lt;n&gt;" (which also modifies

-        diff output, if it is displayed).

+        name, show a prefix that names the object uniquely.

+        "--abbrev=&lt;n&gt;" (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>

@@ -3434,8 +3434,8 @@ combined-diff option or with <code>--no-diff-merges</code>).</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">

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

@@ -4155,7 +4156,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>.

diff --git a/git-ls-files.html b/git-ls-files.html
index de2aba649..751c76ebe 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -759,7 +759,7 @@ git-ls-files(1) Manual Page
                 [--exclude-standard]

                 [--error-unmatch] [--with-tree=&lt;tree-ish&gt;]

                 [--full-name] [--recurse-submodules]

-                [--abbrev] [--] [&lt;file&gt;&#8230;]</pre>

+                [--abbrev[=&lt;n&gt;]] [--] [&lt;file&gt;&#8230;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -1083,7 +1083,8 @@ other
 <dd>

 <p>

         Instead of showing the full 40-byte hexadecimal object

-        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.

         Non default number of digits can be specified with --abbrev=&lt;n&gt;.

 </p>

 </dd>

@@ -1218,7 +1219,7 @@ pattern file appears in.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-04-29 14:18:27 PDT

+ 2020-11-11 14:07:52 PST

 </div>

 </div>

 </body>

diff --git a/git-ls-files.txt b/git-ls-files.txt
index 3cb2ebb43..cbcf5263d 100644
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -19,7 +19,7 @@ SYNOPSIS
 		[--exclude-standard]
 		[--error-unmatch] [--with-tree=<tree-ish>]
 		[--full-name] [--recurse-submodules]
-		[--abbrev] [--] [<file>...]
+		[--abbrev[=<n>]] [--] [<file>...]
 
 DESCRIPTION
 -----------
@@ -153,7 +153,8 @@ a space) at the start of each line:
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
-	lines, show only a partial prefix.
+	lines, show the shortest prefix that is at least '<n>'
+	hexdigits long that uniquely refers the object.
 	Non default number of digits can be specified with --abbrev=<n>.
 
 --debug::
diff --git a/git-ls-tree.html b/git-ls-tree.html
index 8db8d5190..f0c4203c2 100644
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -860,7 +860,8 @@ the behaviour is similar to that of "/bin/ls" in that the <em>&lt;path&gt;</em>
 <dd>

 <p>

         Instead of showing the full 40-byte hexadecimal object

-        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.

         Non default number of digits can be specified with --abbrev=&lt;n&gt;.

 </p>

 </dd>

@@ -929,7 +930,7 @@ verbatim and the line is terminated by a NUL byte.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 08:03:13 PDT

+ 2020-11-11 14:07:52 PST

 </div>

 </div>

 </body>

diff --git a/git-ls-tree.txt b/git-ls-tree.txt
index a7515714d..db02d6d79 100644
--- a/git-ls-tree.txt
+++ b/git-ls-tree.txt
@@ -62,7 +62,8 @@ OPTIONS
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
-	lines, show only a partial prefix.
+	lines, show the shortest prefix that is at least '<n>'
+	hexdigits long that uniquely refers the object.
 	Non default number of digits can be specified with --abbrev=<n>.
 
 --full-name::
diff --git a/git-p4.html b/git-p4.html
index 98176454e..37b533246 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -1327,7 +1327,7 @@ also be used to refuse the Submit after inspect the message file.</p></div>
 <div class="sect2">

 <h3 id="_p4_post_changelist">p4-post-changelist</h3>

 <div class="paragraph"><p>The <code>p4-post-changelist</code> hook is invoked after the submit has

-successfully occured in P4. It takes no parameters and is meant

+successfully occurred in P4. It takes no parameters and is meant

 primarily for notification and cannot affect the outcome of the

 git p4 submit action.</p></div>

 </div>

@@ -1923,7 +1923,7 @@ Each commit imported by <em>git p4</em> has a line at the end of the log
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-04-22 14:37:28 PDT

+ 2020-11-11 14:07:52 PST

 </div>

 </div>

 </body>

diff --git a/git-p4.txt b/git-p4.txt
index dab960901..ec233ac0c 100644
--- a/git-p4.txt
+++ b/git-p4.txt
@@ -417,7 +417,7 @@ p4-post-changelist
 ~~~~~~~~~~~~~~~~~~
 
 The `p4-post-changelist` hook is invoked after the submit has
-successfully occured in P4. It takes no parameters and is meant
+successfully occurred in P4. It takes no parameters and is meant
 primarily for notification and cannot affect the outcome of the
 git p4 submit action.
 
diff --git a/git-rev-list.html b/git-rev-list.html
index 2758311e4..50ab9ad08 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -2207,9 +2207,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=&lt;n&gt;" (which also modifies

-        diff output, if it is displayed).

+        name, show a prefix that names the object uniquely.

+        "--abbrev=&lt;n&gt;" (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>

diff --git a/git-show.html b/git-show.html
index 73ebb3b1f..e383b1ce2 100644
--- a/git-show.html
+++ b/git-show.html
@@ -810,9 +810,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=&lt;n&gt;" (which also modifies

-        diff output, if it is displayed).

+        name, show a prefix that names the object uniquely.

+        "--abbrev=&lt;n&gt;" (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>

@@ -1900,8 +1900,8 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
 <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">

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

@@ -2621,7 +2622,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>.

diff --git a/githooks.html b/githooks.html
index a5867f3ec..bfb928eb6 100644
--- a/githooks.html
+++ b/githooks.html
@@ -1330,7 +1330,7 @@ is called even if <code>--prepare-p4-only</code> is set.</p></div>
 <h3 id="_p4_post_changelist">p4-post-changelist</h3>

 <div class="paragraph"><p>This hook is invoked by <code>git-p4 submit</code>.</p></div>

 <div class="paragraph"><p>The <code>p4-post-changelist</code> hook is invoked after the submit has

-successfully occured in P4. It takes no parameters and is meant

+successfully occurred in P4. It takes no parameters and is meant

 primarily for notification and cannot affect the outcome of the

 git p4 submit action.</p></div>

 <div class="paragraph"><p>Run <code>git-p4 submit --help</code> for details.</p></div>

@@ -1369,7 +1369,7 @@ running passing "1", "1" should not be possible.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-02 14:02:22 PST

+ 2020-11-11 14:07:52 PST

 </div>

 </div>

 </body>

diff --git a/githooks.txt b/githooks.txt
index 4e097dc4e..ffccfc776 100644
--- a/githooks.txt
+++ b/githooks.txt
@@ -655,7 +655,7 @@ p4-post-changelist
 This hook is invoked by `git-p4 submit`.
 
 The `p4-post-changelist` hook is invoked after the submit has
-successfully occured in P4. It takes no parameters and is meant
+successfully occurred in P4. It takes no parameters and is meant
 primarily for notification and cannot affect the outcome of the
 git p4 submit action.
 
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 755df9434..c58690c9d 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:44 PST

+ 2020-11-11 14:08:45 PST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 2b337b20e..8c1bebda0 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:44 PST

+ 2020-11-11 14:08:46 PST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index f8b95a15c..b5e17a0c4 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:38 PST

+ 2020-11-11 14:08:42 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 209a77312..405ac0b34 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:44 PST

+ 2020-11-11 14:08:45 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index e66e36215..2507cfea1 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:44 PST

+ 2020-11-11 14:08:45 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 51417530b..d14b3ca11 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:43 PST

+ 2020-11-11 14:08:45 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index bd59e60da..a6bdbac49 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:43 PST

+ 2020-11-11 14:08:45 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 66d53a47f..25fc9906f 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:42 PST

+ 2020-11-11 14:08:44 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 2cf9eecf7..5e69e6c9d 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:39 PST

+ 2020-11-11 14:08:42 PST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index c78cc9a98..ed8322a1b 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:42 PST

+ 2020-11-11 14:08:44 PST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index bc78ee845..74416e12e 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:41 PST

+ 2020-11-11 14:08:44 PST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index c2b973fae..e628a9d5b 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:40 PST

+ 2020-11-11 14:08:43 PST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 9805a76b9..18804de41 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:40 PST

+ 2020-11-11 14:08:43 PST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index e2ffafba0..35f338220 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:39 PST

+ 2020-11-11 14:08:43 PST

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 08e2959a9..9e549294c 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-09 14:47:40 PST

+ 2020-11-11 14:08:43 PST

 </div>

 </div>

 </body>

diff --git a/pretty-options.txt b/pretty-options.txt
index 17c5aac4b..27ddaf84a 100644
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -16,9 +16,9 @@ configuration (see linkgit:git-config[1]).
 
 --abbrev-commit::
 	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.
 +
 This should make "--pretty=oneline" a whole lot more readable for
 people using 80-column terminals.