Autogenerated HTML docs for v2.37.1-311-g350dc

20 files changed, 79 insertions, 17 deletions

diff --git a/RelNotes/2.38.0.txt b/RelNotes/2.38.0.txt
index 662a92c34..66e278b4f 100644
--- a/RelNotes/2.38.0.txt
+++ b/RelNotes/2.38.0.txt
@@ -33,6 +33,9 @@ UI, Workflows & Features
  * Various messages that come from the pack-bitmap codepaths have been
    tweaked.
 
+ * "git rebase -i" learns to update branches whose tip appear in the
+   rebased range with "--update-refs" option.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -169,7 +172,20 @@ Fixes since v2.37
    CRLF-to-LF conversion correctly, which has been corrected.
    (merge 4d35f74421 mb/p4-utf16-crlf later to maint).
 
+ * "git p4" did not handle non-ASCII client name well, which has been
+   corrected.
+   (merge d205483695 kk/p4-client-name-encoding-fix later to maint).
+
+ * "rerere-train" script (in contrib/) used to honor commit.gpgSign
+   while recreating the throw-away merges.
+   (merge cc391fc886 cl/rerere-train-with-no-sign later to maint).
+
+ * "git checkout" miscounted the paths it updated, which has been
+   corrected.
+   (merge 611c7785e8 mt/checkout-count-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge a700395eaf ma/t4200-update later to maint).
    (merge ae436f283c ma/sparse-checkout-cone-doc-fix later to maint).
    (merge a10f6e2bda sg/index-format-doc-update later to maint).
+   (merge ce5f07983d mt/pkt-line-comment-tweak later to maint).
diff --git a/git-config.html b/git-config.html
index 36cf4a275..4d03f2ce9 100644
--- a/git-config.html
+++ b/git-config.html
@@ -9293,6 +9293,14 @@ rebase.autoStash
 </p>

 </dd>

 <dt class="hdlist1">

+rebase.updateRefs

+</dt>

+<dd>

+<p>

+        If set to true enable <code>--update-refs</code> option by default.

+</p>

+</dd>

+<dt class="hdlist1">

 rebase.missingCommitsCheck

 </dt>

 <dd>

diff --git a/git-rebase.html b/git-rebase.html
index 2db63c4c6..f9a7494be 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1562,6 +1562,21 @@ provided. Otherwise an explicit <code>--no-reschedule-failed-exec</code> at the
 start would be overridden by the presence of

 <code>rebase.rescheduleFailedExec=true</code> configuration.</p></div>

 </dd>

+<dt class="hdlist1">

+--update-refs

+</dt>

+<dt class="hdlist1">

+--no-update-refs

+</dt>

+<dd>

+<p>

+        Automatically force-update any branches that point to commits that

+        are being rebased. Any branches that are checked out in a worktree

+        are not updated in this way.

+</p>

+<div class="paragraph"><p>If the configuration variable <code>rebase.updateRefs</code> is set, then this option

+can be used to override and disable this setting.</p></div>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1650,6 +1665,11 @@ start would be overridden by the presence of
 </li>

 <li>

 <p>

+--update-refs

+</p>

+</li>

+<li>

+<p>

 --root when used in combination with --onto

 </p>

 </li>

@@ -2630,6 +2650,14 @@ rebase.autoStash
 </p>

 </dd>

 <dt class="hdlist1">

+rebase.updateRefs

+</dt>

+<dd>

+<p>

+        If set to true enable <code>--update-refs</code> option by default.

+</p>

+</dd>

+<dt class="hdlist1">

 rebase.missingCommitsCheck

 </dt>

 <dd>

@@ -2721,7 +2749,7 @@ sequence.editor
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-07-18 13:37:02 PDT

+ 2022-08-01 10:59:02 PDT

 </div>

 </div>

 </body>

diff --git a/git-rebase.txt b/git-rebase.txt
index a872ab0fb..080658c87 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -612,6 +612,15 @@ provided. Otherwise an explicit `--no-reschedule-failed-exec` at the
 start would be overridden by the presence of
 `rebase.rescheduleFailedExec=true` configuration.
 
+--update-refs::
+--no-update-refs::
+	Automatically force-update any branches that point to commits that
+	are being rebased. Any branches that are checked out in a worktree
+	are not updated in this way.
++
+If the configuration variable `rebase.updateRefs` is set, then this option
+can be used to override and disable this setting.
+
 INCOMPATIBLE OPTIONS
 --------------------
 
@@ -635,6 +644,7 @@ are incompatible with the following options:
  * --empty=
  * --reapply-cherry-picks
  * --edit-todo
+ * --update-refs
  * --root when used in combination with --onto
 
 In addition, the following pairs of options are incompatible:
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index d62159f5c..19eb35a7c 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-07-27 13:55:58 PDT

+ 2022-08-01 10:59:34 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index a8f909e6c..3881e97b7 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-07-27 13:55:57 PDT

+ 2022-08-01 10:59:34 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 90a9f96ec..a6f996383 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-07-27 13:55:58 PDT

+ 2022-08-01 10:59:34 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 3a7a90425..e91db37ee 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-07-27 13:55:55 PDT

+ 2022-08-01 10:59:31 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 163bdd522..d556acbc7 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-07-27 13:55:57 PDT

+ 2022-08-01 10:59:34 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 1fd5fe34a..52fe83a73 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-07-27 13:55:57 PDT

+ 2022-08-01 10:59:33 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index ee83d8892..1c5131c2b 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-07-27 13:55:57 PDT

+ 2022-08-01 10:59:33 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index e0624a7f5..e75cafd66 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-07-27 13:55:57 PDT

+ 2022-08-01 10:59:33 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 4b2f3c2a1..559eee694 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-07-27 13:55:57 PDT

+ 2022-08-01 10:59:33 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index bc75f427e..37de722cf 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-07-27 13:55:55 PDT

+ 2022-08-01 10:59:32 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index b9a8134eb..2fa0a52a1 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-07-27 13:55:57 PDT

+ 2022-08-01 10:59:33 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 246ba3b7f..5dedc3a75 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-07-27 13:55:56 PDT

+ 2022-08-01 10:59:32 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 519b8c12b..d8ffc8248 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-07-27 13:55:56 PDT

+ 2022-08-01 10:59:32 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index a72c305e2..c6fe51cdc 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-07-27 13:55:56 PDT

+ 2022-08-01 10:59:32 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 95d975208..de1d609a9 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-07-27 13:55:56 PDT

+ 2022-08-01 10:59:32 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 b9ac56ba4..bd7db6874 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-07-27 13:55:56 PDT

+ 2022-08-01 10:59:32 PDT

 </div>

 </div>

 </body>