Autogenerated HTML docs for v2.33.0-363-g4c719

19 files changed, 51 insertions, 21 deletions

diff --git a/RelNotes/2.34.0.txt b/RelNotes/2.34.0.txt
index d21a63ed8..50710e603 100644
--- a/RelNotes/2.34.0.txt
+++ b/RelNotes/2.34.0.txt
@@ -74,6 +74,12 @@ Performance, Internal Implementation, Development Support etc.
  * Callers from older advice_config[] based API has been updated to
    use the newer advice_if_enabled() and advice_enabled() API.
 
+ * Teach "test_pause" and "debug" helpers to allow using the HOME and
+   TERM environment variables the user usually uses.
+
+ * "make INSTALL_STRIP=-s install" allows the installation step to use
+   "install -s" to strip the binaries as they get installed.
+
 
 Fixes since v2.33
 -----------------
@@ -168,6 +174,27 @@ Fixes since v2.33
  * Doc update plus improved error reporting.
    (merge 1e93770888 jk/log-warn-on-bogus-encoding later to maint).
 
+ * Recent "diff -m" changes broke "gitk", which has been corrected.
+   (merge 5acffd3473 so/diff-index-regression-fix later to maint).
+
+ * Regression fix.
+   (merge b996f84989 ab/send-email-config-fix later to maint).
+
+ * The "git apply -3" code path learned not to bother the lower level
+   merge machinery when the three-way merge can be trivially resolved
+   without the content level merge.  This fixes a regression caused by
+   recent "-3way first and fall back to direct application" change.
+   (merge 57f183b698 jc/trivial-threeway-binary-merge later to maint).
+
+ * The code that optionally creates the *.rev reverse index file has
+   been optimized to avoid needless computation when it is not writing
+   the file out.
+   (merge 8fe8bae9d2 ab/reverse-midx-optim later to maint).
+
+ * "git range-diff -I... <range> <range>" segfaulted, which has been
+   corrected.
+   (merge 709b3f32d3 rs/range-diff-avoid-segfault-with-I later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 1d9c8daef8 ab/bundle-doc later to maint).
    (merge 81483fe613 en/merge-strategy-docs later to maint).
@@ -194,3 +221,6 @@ Fixes since v2.33
    (merge e4f8d27585 rs/show-branch-simplify later to maint).
    (merge e124ecf7f7 rs/archive-use-object-id later to maint).
    (merge cebead1ebf cb/ci-build-pedantic later to maint).
+   (merge ca0cc98e03 bs/doc-bugreport-outdir later to maint).
+   (merge 72b113e562 ab/no-more-check-bindir later to maint).
+   (merge 92a5d1c9b4 jc/prefix-filename-allocates later to maint).
diff --git a/git-bugreport.html b/git-bugreport.html
index caf04f5ce..614826b78 100644
--- a/git-bugreport.html
+++ b/git-bugreport.html
@@ -825,8 +825,8 @@ the kind of information listed above when manually asking for help.</p></div>
 </dt>

 <dd>

 <p>

-        Place the resulting bug report file in <code>&lt;path&gt;</code> instead of the root of

-        the Git repository.

+        Place the resulting bug report file in <code>&lt;path&gt;</code> instead of the current

+        directory.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -856,7 +856,7 @@ the kind of information listed above when manually asking for help.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-06-08 18:30:54 PDT

+ 2021-09-15 15:35:30 PDT

 </div>

 </div>

 </body>

diff --git a/git-bugreport.txt b/git-bugreport.txt
index 66e88c2e3..d8817bf3c 100644
--- a/git-bugreport.txt
+++ b/git-bugreport.txt
@@ -40,8 +40,8 @@ OPTIONS
 -------
 -o <path>::
 --output-directory <path>::
-	Place the resulting bug report file in `<path>` instead of the root of
-	the Git repository.
+	Place the resulting bug report file in `<path>` instead of the current
+	directory.
 
 -s <format>::
 --suffix <format>::
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index cd4828874..54ad06591 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-09-10 12:52:20 PDT

+ 2021-09-15 15:36:53 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 47dfcf3a0..ffab954df 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

- 2021-09-10 12:52:20 PDT

+ 2021-09-15 15:36:52 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 814fd3bb4..d498997d1 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

- 2021-09-10 12:52:20 PDT

+ 2021-09-15 15:36:52 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 80a7181d2..1c18ab4f4 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

- 2021-09-10 12:52:16 PDT

+ 2021-09-15 15:36:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 58eeb9e26..0d7108ab3 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

- 2021-09-10 12:52:20 PDT

+ 2021-09-15 15:36:52 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 54a675674..d08eb947a 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

- 2021-09-10 12:52:20 PDT

+ 2021-09-15 15:36:52 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 888db180d..69e2da284 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

- 2021-09-10 12:52:19 PDT

+ 2021-09-15 15:36:51 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index e4960449a..40efa8533 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

- 2021-09-10 12:52:20 PDT

+ 2021-09-15 15:36:51 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index aa64e3862..56d94e5b0 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

- 2021-09-10 12:52:19 PDT

+ 2021-09-15 15:36:50 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index aa79f5f29..068f51143 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

- 2021-09-10 12:52:17 PDT

+ 2021-09-15 15:36:47 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index ec9b69e61..3e4921b99 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

- 2021-09-10 12:52:19 PDT

+ 2021-09-15 15:36:50 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 5d578f756..ae0a30d83 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

- 2021-09-10 12:52:18 PDT

+ 2021-09-15 15:36:49 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index a0e023347..33a8cd034 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

- 2021-09-10 12:52:18 PDT

+ 2021-09-15 15:36:49 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 6a8b6e0c4..a9e0b33dc 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

- 2021-09-10 12:52:18 PDT

+ 2021-09-15 15:36:48 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 6a5f599a0..4a081fc42 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

- 2021-09-10 12:52:17 PDT

+ 2021-09-15 15:36:47 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index eabf74d60..ad8b02548 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

- 2021-09-10 12:52:17 PDT

+ 2021-09-15 15:36:48 PDT

 </div>

 </div>

 </body>