Autogenerated HTML docs for v2.29.2-435-g72ffeb

20 files changed, 82 insertions, 24 deletions

diff --git a/MyFirstContribution.html b/MyFirstContribution.html
index 9ad367c9a..ee18e9d1e 100644
--- a/MyFirstContribution.html
+++ b/MyFirstContribution.html
@@ -1829,10 +1829,22 @@ index 88f126184c..38da593a60 100644
 <div class="paragraph"><p>After a few days, you will hopefully receive a reply to your patchset with some

 comments. Woohoo! Now you can get back to work.</p></div>

 <div class="paragraph"><p>It&#8217;s good manners to reply to each comment, notifying the reviewer that you have

-made the change requested, feel the original is better, or that the comment

+made the change suggested, feel the original is better, or that the comment

 inspired you to do something a new way which is superior to both the original

 and the suggested change. This way reviewers don&#8217;t need to inspect your v2 to

 figure out whether you implemented their comment or not.</p></div>

+<div class="paragraph"><p>Reviewers may ask you about what you wrote in the patchset, either in

+the proposed commit log message or in the changes themselves.  You

+should answer these questions in your response messages, but often the

+reason why reviewers asked these questions to understand what you meant

+to write is because your patchset needed clarification to be understood.</p></div>

+<div class="paragraph"><p>Do not be satisfied by just answering their questions in your response

+and hear them say that they now understand what you wanted to say.

+Update your patches to clarify the points reviewers had trouble with,

+and prepare your v2; the words you used to explain your v1 to answer

+reviewers' questions may be useful thing to use.  Your goal is to make

+your v2 clear enough so that it becomes unnecessary for you to give the

+same explanation to the next person who reads it.</p></div>

 <div class="paragraph"><p>If you are going to push back on a comment, be polite and explain why you feel

 your original is better; be prepared that the reviewer may still disagree with

 you, and the rest of the community may weigh in on one side or the other. As

@@ -1900,7 +1912,7 @@ should generate your diffs from <code>&lt;topic&gt;..&lt;mybranch&gt;</code> and
 <div id="footer">

 <div id="footer-text">

 Last updated

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

+ 2020-11-30 20:44:23 PST

 </div>

 </div>

 </body>

diff --git a/MyFirstContribution.txt b/MyFirstContribution.txt
index 60eed5edc..7c9a037cc 100644
--- a/MyFirstContribution.txt
+++ b/MyFirstContribution.txt
@@ -1143,11 +1143,25 @@ After a few days, you will hopefully receive a reply to your patchset with some
 comments. Woohoo! Now you can get back to work.
 
 It's good manners to reply to each comment, notifying the reviewer that you have
-made the change requested, feel the original is better, or that the comment
+made the change suggested, feel the original is better, or that the comment
 inspired you to do something a new way which is superior to both the original
 and the suggested change. This way reviewers don't need to inspect your v2 to
 figure out whether you implemented their comment or not.
 
+Reviewers may ask you about what you wrote in the patchset, either in
+the proposed commit log message or in the changes themselves.  You
+should answer these questions in your response messages, but often the
+reason why reviewers asked these questions to understand what you meant
+to write is because your patchset needed clarification to be understood.
+
+Do not be satisfied by just answering their questions in your response
+and hear them say that they now understand what you wanted to say.
+Update your patches to clarify the points reviewers had trouble with,
+and prepare your v2; the words you used to explain your v1 to answer
+reviewers' questions may be useful thing to use.  Your goal is to make
+your v2 clear enough so that it becomes unnecessary for you to give the
+same explanation to the next person who reads it.
+
 If you are going to push back on a comment, be polite and explain why you feel
 your original is better; be prepared that the reviewer may still disagree with
 you, and the rest of the community may weigh in on one side or the other. As
diff --git a/RelNotes/2.30.0.txt b/RelNotes/2.30.0.txt
index aef881081..c0892759e 100644
--- a/RelNotes/2.30.0.txt
+++ b/RelNotes/2.30.0.txt
@@ -128,6 +128,14 @@ Performance, Internal Implementation, Development Support etc.
  * A lazily defined test prerequisite can now be defined in terms of
    another lazily defined test prerequisite.
 
+ * Expectation for the original contributor after responding to a
+   review comment to use the explanation in a patch update has been
+   described.
+
+ * Multiple "credential-store" backends can race to lock the same
+   file, causing everybody else but one to fail---reattempt locking
+   with some timeout to reduce the rate of the failure.
+
 
 Fixes since v2.29
 -----------------
@@ -265,6 +273,16 @@ Fixes since v2.29
    repositories.
    (merge ea699b4adc sg/t5310-jgit-wants-sha1 later to maint).
 
+ * Config parser fix for "git notes".
+   (merge 45fef1599a na/notes-displayref-is-not-boolean later to maint).
+
+ * Move a definition of compatibility wrapper from cache.h to
+   git-compat-util.h
+   (merge a76b138daa hn/sleep-millisec-decl later to maint).
+
+ * Error message fix.
+   (merge eaf5341538 km/stash-error-message-fix 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).
@@ -286,3 +304,6 @@ Fixes since v2.29
    (merge 5a923bb1f0 ma/list-object-filter-opt-msgfix later to maint).
    (merge 1c3e412916 rs/archive-plug-leak-refname later to maint).
    (merge d44e5267ea rs/plug-diff-cache-leak later to maint).
+   (merge 793c1464d3 ab/gc-keep-base-option later to maint).
+   (merge b86339b12b mt/worktree-error-message-fix later to maint).
+   (merge e01ae2a4a7 js/pull-rebase-use-advise later to maint).
diff --git a/git-config.html b/git-config.html
index 360436fcd..6d55b5ba0 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4047,6 +4047,17 @@ credentialCache.ignoreSIGHUP
 </p>

 </dd>

 <dt class="hdlist1">

+credentialStore.lockTimeoutMS

+</dt>

+<dd>

+<p>

+        The length of time, in milliseconds, for git-credential-store to retry

+        when trying to lock the credentials file. Value 0 means not to retry at

+        all; -1 means to try indefinitely. Default is 1000 (i.e., retry for

+        1s).

+</p>

+</dd>

+<dt class="hdlist1">

 completion.commands

 </dt>

 <dd>

@@ -5224,9 +5235,9 @@ gc.bigPackThreshold
 <dd>

 <p>

         If non-zero, all packs larger than this limit are kept when

-        <code>git gc</code> is run. This is very similar to <code>--keep-base-pack</code>

+        <code>git gc</code> is run. This is very similar to <code>--keep-largest-pack</code>

         except that all packs that meet the threshold are kept, not

-        just the base pack. Defaults to zero. Common unit suffixes of

+        just the largest pack. Defaults to zero. Common unit suffixes of

         <em>k</em>, <em>m</em>, or <em>g</em> are supported.

 </p>

 <div class="paragraph"><p>Note that if the number of kept packs is more than gc.autoPackLimit,

@@ -5236,7 +5247,7 @@ gc.autoPackLimit and gc.bigPackThreshold should be respected again.</p></div>
 <div class="paragraph"><p>If the amount of memory estimated for <code>git repack</code> to run smoothly is

 not available and <code>gc.bigPackThreshold</code> is not set, the largest pack

 will also be excluded (this is the equivalent of running <code>git gc</code> with

-<code>--keep-base-pack</code>).</p></div>

+<code>--keep-largest-pack</code>).</p></div>

 </dd>

 <dt class="hdlist1">

 gc.writeCommitGraph

diff --git a/git-gc.html b/git-gc.html
index a2973de2c..d56f0df63 100644
--- a/git-gc.html
+++ b/git-gc.html
@@ -957,9 +957,9 @@ gc.bigPackThreshold
 <dd>

 <p>

         If non-zero, all packs larger than this limit are kept when

-        <code>git gc</code> is run. This is very similar to <code>--keep-base-pack</code>

+        <code>git gc</code> is run. This is very similar to <code>--keep-largest-pack</code>

         except that all packs that meet the threshold are kept, not

-        just the base pack. Defaults to zero. Common unit suffixes of

+        just the largest pack. Defaults to zero. Common unit suffixes of

         <em>k</em>, <em>m</em>, or <em>g</em> are supported.

 </p>

 <div class="paragraph"><p>Note that if the number of kept packs is more than gc.autoPackLimit,

@@ -969,7 +969,7 @@ gc.autoPackLimit and gc.bigPackThreshold should be respected again.</p></div>
 <div class="paragraph"><p>If the amount of memory estimated for <code>git repack</code> to run smoothly is

 not available and <code>gc.bigPackThreshold</code> is not set, the largest pack

 will also be excluded (this is the equivalent of running <code>git gc</code> with

-<code>--keep-base-pack</code>).</p></div>

+<code>--keep-largest-pack</code>).</p></div>

 </dd>

 <dt class="hdlist1">

 gc.writeCommitGraph

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 6efbf9382..008512d0b 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-25 16:48:58 PST

+ 2020-11-30 20:45:24 PST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 2d292b1b6..94992175b 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-25 16:48:58 PST

+ 2020-11-30 20:45:24 PST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index f2ed18d57..19386e085 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-25 16:48:54 PST

+ 2020-11-30 20:45:20 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 1e8a87645..bbae50c00 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-25 16:48:57 PST

+ 2020-11-30 20:45:24 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 54b7d5abb..2b647231b 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-25 16:48:57 PST

+ 2020-11-30 20:45:24 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 088c2302d..c7bf2d511 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-25 16:48:57 PST

+ 2020-11-30 20:45:23 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index cc3864d7f..2c74877a1 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-25 16:48:57 PST

+ 2020-11-30 20:45:24 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 4b8afca6f..68c0cdcfa 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-25 16:48:56 PST

+ 2020-11-30 20:45:23 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 397558393..71ce186f5 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-25 16:48:54 PST

+ 2020-11-30 20:45:20 PST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 0c7b76c2d..27449cf17 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-25 16:48:56 PST

+ 2020-11-30 20:45:23 PST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index e6bb4affb..880fb59e3 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-25 16:48:55 PST

+ 2020-11-30 20:45:22 PST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 8df2c1ed5..6a6a8d29c 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-25 16:48:55 PST

+ 2020-11-30 20:45:22 PST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index bf00dfdd6..6ad25e539 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-25 16:48:55 PST

+ 2020-11-30 20:45:21 PST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index a73a30002..beb2e0701 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-25 16:48:54 PST

+ 2020-11-30 20:45:21 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 ef967b3bc..12dbb78f2 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-25 16:48:54 PST

+ 2020-11-30 20:45:21 PST

 </div>

 </div>

 </body>