Autogenerated HTML docs for v2.34.0-rc0-19-g0cddd

20 files changed, 39 insertions, 25 deletions

diff --git a/RelNotes/2.34.0.txt b/RelNotes/2.34.0.txt
index c1121b7a5..f6d5834c8 100644
--- a/RelNotes/2.34.0.txt
+++ b/RelNotes/2.34.0.txt
@@ -79,6 +79,10 @@ UI, Workflows & Features
 
  * Use ssh public crypto for object and push-cert signing.
 
+ * "git log --grep=string --author=name" learns to highlight hits just
+   like "git grep string" does.
+
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -392,6 +396,11 @@ Fixes since v2.33
  * Fix long-standing shell syntax error in the completion script.
    (merge 46b0585286 re/completion-fix-test-equality later to maint).
 
+ * Teach "git commit-graph" command not to allow using replace objects
+   at all, as we do not use the commit-graph at runtime when we see
+   object replacement.
+   (merge 095d112f8c ab/ignore-replace-while-working-on-commit-graph later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f188160be9 ab/bundle-remove-verbose-option later to maint).
    (merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
@@ -407,3 +416,5 @@ Fixes since v2.33
    (merge 1c720357ce ab/test-lib-diff-cleanup later to maint).
    (merge 6b615dbece ks/submodule-add-message-fix later to maint).
    (merge 82a57cd13f ma/doc-git-version later to maint).
+   (merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint).
+   (merge 559664c792 ab/test-lib later to maint).
diff --git a/git-config.html b/git-config.html
index 8660418f0..4ad43436f 100644
--- a/git-config.html
+++ b/git-config.html
@@ -3734,7 +3734,8 @@ color.grep.<slot>
 </dt>

 <dd>

 <p>

-        matching text in selected lines

+        matching text in selected lines. Also, used to customize the following

+        <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code> and <code>--committer</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -3742,7 +3743,9 @@ color.grep.&lt;slot&gt;
 </dt>

 <dd>

 <p>

-        non-matching text in selected lines

+        non-matching text in selected lines. Also, used to customize the

+        following <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code> and

+        <code>--committer</code>.

 </p>

 </dd>

 <dt class="hdlist1">

diff --git a/git-format-patch.html b/git-format-patch.html
index ee1c05edc..2322933a6 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -2474,10 +2474,10 @@ prerequisite-patch-id: Z</code></pre>
 <div class="paragraph"><p>You can also use <code>git format-patch --base=P -3 C</code> to generate patches

 for A, B and C, and the identifiers for P, X, Y, Z are appended at the

 end of the first message.</p></div>

-<div class="paragraph"><p>If set <code>--base=auto</code> in cmdline, it will track base commit automatically,

-the base commit will be the merge base of tip commit of the remote-tracking

+<div class="paragraph"><p>If set <code>--base=auto</code> in cmdline, it will automatically compute

+the base commit as the merge base of tip commit of the remote-tracking

 branch and revision-range specified in cmdline.

-For a local branch, you need to track a remote branch by <code>git branch

+For a local branch, you need to make it to track a remote branch by <code>git branch

 --set-upstream-to</code> before using this option.</p></div>

 </div>

 </div>

@@ -2569,7 +2569,7 @@ merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 22:11:31 PDT

+ 2021-11-01 17:08:30 PDT

 </div>

 </div>

 </body>

diff --git a/git-format-patch.txt b/git-format-patch.txt
index fe2f69d36..113eabc10 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -689,10 +689,10 @@ You can also use `git format-patch --base=P -3 C` to generate patches
 for A, B and C, and the identifiers for P, X, Y, Z are appended at the
 end of the first message.
 
-If set `--base=auto` in cmdline, it will track base commit automatically,
-the base commit will be the merge base of tip commit of the remote-tracking
+If set `--base=auto` in cmdline, it will automatically compute
+the base commit as the merge base of tip commit of the remote-tracking
 branch and revision-range specified in cmdline.
-For a local branch, you need to track a remote branch by `git branch
+For a local branch, you need to make it to track a remote branch by `git branch
 --set-upstream-to` before using this option.
 
 EXAMPLES
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index ae4b81cb9..0220ae732 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-10-29 16:18:51 PDT

+ 2021-11-01 17:09:07 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 48f782220..dbb01690c 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-10-29 16:18:51 PDT

+ 2021-11-01 17:09:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 6d569fb59..179748a2d 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-10-29 16:18:51 PDT

+ 2021-11-01 17:09:07 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 4334d5970..0f5be31da 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-10-29 16:18:48 PDT

+ 2021-11-01 17:09:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index c5a6e7805..2c0473151 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-10-29 16:18:50 PDT

+ 2021-11-01 17:09:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index a09ad6fb3..7673e3a28 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-10-29 16:18:50 PDT

+ 2021-11-01 17:09:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 27e6e5c36..912da9381 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-10-29 16:18:50 PDT

+ 2021-11-01 17:09:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index fe9836295..922455d0b 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-10-29 16:18:50 PDT

+ 2021-11-01 17:09:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 5d8ce04a9..16864ddf9 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-10-29 16:18:50 PDT

+ 2021-11-01 17:09:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index a298b23a7..c62b6daf9 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-10-29 16:18:49 PDT

+ 2021-11-01 17:09:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 6e7fb486b..724061e96 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-10-29 16:18:50 PDT

+ 2021-11-01 17:09:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index eb2486120..4865c19b5 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-10-29 16:18:50 PDT

+ 2021-11-01 17:09:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 8ece39443..c8946effb 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-10-29 16:18:49 PDT

+ 2021-11-01 17:09:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 2798b6a25..1b007627b 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-10-29 16:18:49 PDT

+ 2021-11-01 17:09:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 5e7ef4f1c..a7e07f10d 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-10-29 16:18:49 PDT

+ 2021-11-01 17:09:04 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 73e9cc3e1..83cb06b79 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-10-29 16:18:49 PDT

+ 2021-11-01 17:09:05 PDT

 </div>

 </div>

 </body>