Autogenerated HTML docs for v2.36.1-74-g277cf0

19 files changed, 39 insertions, 21 deletions

diff --git a/RelNotes/2.37.0.txt b/RelNotes/2.37.0.txt
index 817540643..ac8fd41e5 100644
--- a/RelNotes/2.37.0.txt
+++ b/RelNotes/2.37.0.txt
@@ -69,6 +69,22 @@ Fixes since v2.36
    when processing only parts of the file.
    (merge e5f5d7d42e ea/progress-partial-blame later to maint).
 
+ * "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
+   commit to rebase onto incorrectly, which has been corrected.
+   (merge 9e5ebe9668 ah/rebase-keep-base-fix later to maint).
+
+ * Fix a leak of FILE * in an error codepath.
+   (merge c0befa0c03 kt/commit-graph-plug-fp-leak-on-error later to maint).
+
+ * Avoid problems from interaction between malloc_check and address
+   sanitizer.
+   (merge 067109a5e7 pw/test-malloc-with-sanitize-address later to maint).
+
+ * The commit summary shown after making a commit is matched to what
+   is given in "git status" not to use the break-rewrite heuristics.
+   (merge 84792322ed rs/commit-summary-wo-break-rewrite later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge e6b2582da3 cm/reftable-0-length-memset later to maint).
    (merge 0b75e5bf22 ab/misc-cleanup later to maint).
+   (merge 52e1ab8a76 ea/rebase-code-simplify later to maint).
diff --git a/git-rebase.html b/git-rebase.html
index 97a59bb1f..16787a6b6 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -952,9 +952,10 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div>
 <dd>

 <p>

         Set the starting point at which to create the new commits to the

-        merge base of &lt;upstream&gt; &lt;branch&gt;. Running

+        merge base of &lt;upstream&gt; and &lt;branch&gt;. Running

         <em>git rebase --keep-base &lt;upstream&gt; &lt;branch&gt;</em> is equivalent to

-        running <em>git rebase --onto &lt;upstream&gt;&#8230; &lt;upstream&gt;</em>.

+        running

+        <em>git rebase --onto &lt;upstream&gt;&#8230;&lt;branch&gt; &lt;upstream&gt; &lt;branch&gt;</em>.

 </p>

 <div class="paragraph"><p>This option is useful in the case where one is developing a feature on

 top of an upstream branch. While the feature is being worked on, the

@@ -2703,7 +2704,7 @@ sequence.editor
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-12-15 12:58:55 PST

+ 2022-05-11 15:14:01 PDT

 </div>

 </div>

 </body>

diff --git a/git-rebase.txt b/git-rebase.txt
index 9da464706..262fb01ae 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -215,9 +215,10 @@ leave out at most one of A and B, in which case it defaults to HEAD.
 
 --keep-base::
 	Set the starting point at which to create the new commits to the
-	merge base of <upstream> <branch>. Running
+	merge base of <upstream> and <branch>. Running
 	'git rebase --keep-base <upstream> <branch>' is equivalent to
-	running 'git rebase --onto <upstream>... <upstream>'.
+	running
+	'git rebase --onto <upstream>...<branch> <upstream> <branch>'.
 +
 This option is useful in the case where one is developing a feature on
 top of an upstream branch. While the feature is being worked on, the
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index d93537a7c..4587b022b 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

- 2022-05-10 17:54:44 PDT

+ 2022-05-11 15:14:38 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 841e55d5b..5062df96b 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

- 2022-05-10 17:54:44 PDT

+ 2022-05-11 15:14:38 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index f3f6d45fc..e3b4c2224 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

- 2022-05-10 17:54:44 PDT

+ 2022-05-11 15:14:38 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 3d71cf27a..6bc1c4dc4 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

- 2022-05-10 17:54:42 PDT

+ 2022-05-11 15:14:36 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 83273a33d..822172681 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

- 2022-05-10 17:54:44 PDT

+ 2022-05-11 15:14:38 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 856d853a4..67e5aa542 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

- 2022-05-10 17:54:43 PDT

+ 2022-05-11 15:14:38 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 674394308..07338a453 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

- 2022-05-10 17:54:43 PDT

+ 2022-05-11 15:14:37 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 338897853..0aa31e3df 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

- 2022-05-10 17:54:43 PDT

+ 2022-05-11 15:14:37 PDT

 </div>

 </div>

 </body>

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

- 2022-05-10 17:54:43 PDT

+ 2022-05-11 15:14:37 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index e921681ac..0ea728456 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

- 2022-05-10 17:54:42 PDT

+ 2022-05-11 15:14:36 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index e2bdb73f4..6ca1b573b 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

- 2022-05-10 17:54:43 PDT

+ 2022-05-11 15:14:37 PDT

 </div>

 </div>

 </body>

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

- 2022-05-10 17:54:43 PDT

+ 2022-05-11 15:14:37 PDT

 </div>

 </div>

 </body>

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

- 2022-05-10 17:54:43 PDT

+ 2022-05-11 15:14:37 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index a22a76870..4b61323ed 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

- 2022-05-10 17:54:42 PDT

+ 2022-05-11 15:14:37 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index e4a666015..430515938 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

- 2022-05-10 17:54:42 PDT

+ 2022-05-11 15:14:36 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 1c11ab78e..631904eeb 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

- 2022-05-10 17:54:42 PDT

+ 2022-05-11 15:14:36 PDT

 </div>

 </div>

 </body>