Autogenerated HTML docs for v2.29.2-366-gb291b0

24 files changed, 96 insertions, 21 deletions

diff --git a/RelNotes/2.30.0.txt b/RelNotes/2.30.0.txt
index 0933a7f84..4c5be2dd0 100644
--- a/RelNotes/2.30.0.txt
+++ b/RelNotes/2.30.0.txt
@@ -68,6 +68,13 @@ UI, Workflows & Features
 
  * Zsh autocompletion (in contrib/) update.
 
+ * The maximum length of output filenames "git format-patch" creates
+   has become configurable (used to be capped at 64).
+
+ * "git rev-parse" learned the "--end-of-options" to help scripts to
+   safely take a parameter that is supposed to be a revision, e.g.
+   "git rev-parse --verify -q --end-of-options $rev".
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -107,6 +114,9 @@ Performance, Internal Implementation, Development Support etc.
  * "git fetch --depth=<n>" over the stateless RPC / smart HTTP
    transport handled EOF from the client poorly at the server end.
 
+ * A specialization of hashmap that uses a string as key has been
+   introduced.  Hopefully it will see wider use over time.
+
 
 Fixes since v2.29
 -----------------
@@ -217,6 +227,16 @@ Fixes since v2.29
    non-existent object name in the input, instead of complaining.
    (merge c714d05875 jc/blame-ignore-fix later to maint).
 
+ * Running "git diff" while allowing external diff in a state with
+   unmerged paths used to segfault, which has been corrected.
+   (merge d66851806f jk/diff-release-filespec-fix later to maint).
+
+ * Build configuration cleanup.
+   (merge b990f02fd8 ab/config-mak-uname-simplify later to maint).
+
+ * Fix regression introduced when nvimdiff support in mergetool was added.
+   (merge 12026f46e7 pd/mergetool-nvimdiff 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).
diff --git a/git-config.html b/git-config.html
index b60800884..360436fcd 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4436,6 +4436,11 @@ diff.guitool
 <div class="ulist"><ul>

 <li>

 <p>

+bc3

+</p>

+</li>

+<li>

+<p>

 gvimdiff

 </p>

 </li>

@@ -5008,6 +5013,16 @@ format.outputDirectory
 </p>

 </dd>

 <dt class="hdlist1">

+format.filenameMaxLength

+</dt>

+<dd>

+<p>

+        The maximum length of the output filenames generated by the

+        <code>format-patch</code> command; defaults to 64.  Can be overridden

+        by the <code>--filename-max-length=&lt;n&gt;</code> command line option.

+</p>

+</dd>

+<dt class="hdlist1">

 format.useAutoBase

 </dt>

 <dd>

@@ -7173,6 +7188,11 @@ merge.guitool
 <div class="ulist"><ul>

 <li>

 <p>

+bc3

+</p>

+</li>

+<li>

+<p>

 gvimdiff

 </p>

 </li>

diff --git a/git-format-patch.html b/git-format-patch.html
index 0c244c0a1..99b8461bc 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -768,6 +768,7 @@ git-format-patch(1) Manual Page
                    [--no-notes | --notes[=&lt;ref&gt;]]

                    [--interdiff=&lt;previous&gt;]

                    [--range-diff=&lt;previous&gt; [--creation-factor=&lt;percent&gt;]]

+                   [--filename-max-length=&lt;n&gt;]

                    [--progress]

                    [&lt;common diff options&gt;]

                    [ &lt;since&gt; | &lt;revision range&gt; ]</pre>

@@ -1778,6 +1779,18 @@ populated with placeholder text.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--filename-max-length=&lt;n&gt;

+</dt>

+<dd>

+<p>

+        Instead of the standard 64 bytes, chomp the generated output

+        filenames at around <em>&lt;n&gt;</em> bytes (too short a value will be

+        silently raised to a reasonable length).  Defaults to the

+        value of the <code>format.filenameMaxLength</code> configuration

+        variable, or 64 if unconfigured.

+</p>

+</dd>

+<dt class="hdlist1">

 --rfc

 </dt>

 <dd>

@@ -2495,7 +2508,7 @@ Extract three topmost commits from the current branch and format them
 <div id="footer">

 <div id="footer-text">

 Last updated

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

+ 2020-11-23 11:57:47 PST

 </div>

 </div>

 </body>

diff --git a/git-format-patch.txt b/git-format-patch.txt
index bf1bb40f6..3e49bf221 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -28,6 +28,7 @@ SYNOPSIS
 		   [--no-notes | --notes[=<ref>]]
 		   [--interdiff=<previous>]
 		   [--range-diff=<previous> [--creation-factor=<percent>]]
+		   [--filename-max-length=<n>]
 		   [--progress]
 		   [<common diff options>]
 		   [ <since> | <revision range> ]
@@ -200,6 +201,13 @@ populated with placeholder text.
 	allows for useful naming of a patch series, and can be
 	combined with the `--numbered` option.
 
+--filename-max-length=<n>::
+	Instead of the standard 64 bytes, chomp the generated output
+	filenames at around '<n>' bytes (too short a value will be
+	silently raised to a reasonable length).  Defaults to the
+	value of the `format.filenameMaxLength` configuration
+	variable, or 64 if unconfigured.
+
 --rfc::
 	Alias for `--subject-prefix="RFC PATCH"`. RFC means "Request For
 	Comments"; use this when sending an experimental patch for
diff --git a/git-merge.html b/git-merge.html
index 211904202..761e32e78 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1910,6 +1910,11 @@ merge.guitool
 <div class="ulist"><ul>

 <li>

 <p>

+bc3

+</p>

+</li>

+<li>

+<p>

 gvimdiff

 </p>

 </li>

diff --git a/git-rev-parse.html b/git-rev-parse.html
index be1a22968..443db9377 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -915,6 +915,9 @@ names an existing object that is a commit-ish (i.e. a commit, or an
 annotated tag that points at a commit).  To make sure that <code>$VAR</code>

 names an existing object of any type, <code>git rev-parse "$VAR^{object}"</code>

 can be used.</p></div>

+<div class="paragraph"><p>Note that if you are verifying a name from an untrusted source, it is

+wise to use <code>--end-of-options</code> so that the name argument is not mistaken

+for another option.</p></div>

 </dd>

 <dt class="hdlist1">

 -q

@@ -1994,7 +1997,7 @@ Print the commit object name from the revision in the $REV shell variable:
 </p>

 <div class="listingblock">

 <div class="content">

-<pre><code>$ git rev-parse --verify $REV^{commit}</code></pre>

+<pre><code>$ git rev-parse --verify --end-of-options $REV^{commit}</code></pre>

 </div></div>

 <div class="paragraph"><p>This will error out if $REV is empty or not a valid revision.</p></div>

 </li>

@@ -2004,7 +2007,7 @@ Similar to above:
 </p>

 <div class="listingblock">

 <div class="content">

-<pre><code>$ git rev-parse --default master --verify $REV</code></pre>

+<pre><code>$ git rev-parse --default master --verify --end-of-options $REV</code></pre>

 </div></div>

 <div class="paragraph"><p>but if $REV is empty, the commit object name from master will be printed.</p></div>

 </li>

@@ -2022,7 +2025,7 @@ Similar to above:
 <div id="footer">

 <div id="footer-text">

 Last updated

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

+ 2020-11-23 11:57:47 PST

 </div>

 </div>

 </body>

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 19b12b6d4..5013daa6e 100644
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -109,6 +109,10 @@ names an existing object that is a commit-ish (i.e. a commit, or an
 annotated tag that points at a commit).  To make sure that `$VAR`
 names an existing object of any type, `git rev-parse "$VAR^{object}"`
 can be used.
++
+Note that if you are verifying a name from an untrusted source, it is
+wise to use `--end-of-options` so that the name argument is not mistaken
+for another option.
 
 -q::
 --quiet::
@@ -446,7 +450,7 @@ $ git rev-parse --verify HEAD
 * Print the commit object name from the revision in the $REV shell variable:
 +
 ------------
-$ git rev-parse --verify $REV^{commit}
+$ git rev-parse --verify --end-of-options $REV^{commit}
 ------------
 +
 This will error out if $REV is empty or not a valid revision.
@@ -454,7 +458,7 @@ This will error out if $REV is empty or not a valid revision.
 * Similar to above:
 +
 ------------
-$ git rev-parse --default master --verify $REV
+$ git rev-parse --default master --verify --end-of-options $REV
 ------------
 +
 but if $REV is empty, the commit object name from master will be printed.
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 0c4d0c2f8..0d207dea3 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-18 14:13:14 PST

+ 2020-11-23 11:59:17 PST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 42bca7533..3e1160c4a 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-18 14:13:14 PST

+ 2020-11-23 11:59:17 PST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 87329fa0b..0be86fe07 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-18 14:13:11 PST

+ 2020-11-23 11:59:11 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index cb81f2acb..3cd50f419 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-18 14:13:14 PST

+ 2020-11-23 11:59:17 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 87e8eeebe..a76be67b3 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-18 14:13:14 PST

+ 2020-11-23 11:59:16 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 5565b7e18..d22a15797 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-18 14:13:13 PST

+ 2020-11-23 11:59:15 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 7e22e93e1..c5ea05f71 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-18 14:13:14 PST

+ 2020-11-23 11:59:16 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 7fb0ae544..685200a68 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-18 14:13:13 PST

+ 2020-11-23 11:59:15 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 6014780b5..8c4f42ca5 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-18 14:13:11 PST

+ 2020-11-23 11:59:12 PST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index bb5e2ad99..e64bbcb06 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-18 14:13:13 PST

+ 2020-11-23 11:59:14 PST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 12a751f24..5ab121721 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-18 14:13:12 PST

+ 2020-11-23 11:59:14 PST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 55f00ff70..cb14acbc1 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-18 14:13:12 PST

+ 2020-11-23 11:59:13 PST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 5262ecaa9..5bdf7b8f8 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-18 14:13:12 PST

+ 2020-11-23 11:59:13 PST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index bab165d5d..65f975105 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-18 14:13:11 PST

+ 2020-11-23 11:59:12 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 a290ff156..662ef7079 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-18 14:13:12 PST

+ 2020-11-23 11:59:12 PST

 </div>

 </div>

 </body>

diff --git a/mergetools-diff.txt b/mergetools-diff.txt
index a9a59f9a7..c27eb7863 100644
--- a/mergetools-diff.txt
+++ b/mergetools-diff.txt
@@ -1,3 +1,4 @@
+* bc3
 * gvimdiff
 * gvimdiff2
 * gvimdiff3
diff --git a/mergetools-merge.txt b/mergetools-merge.txt
index a9a59f9a7..c27eb7863 100644
--- a/mergetools-merge.txt
+++ b/mergetools-merge.txt
@@ -1,3 +1,4 @@
+* bc3
 * gvimdiff
 * gvimdiff2
 * gvimdiff3