Autogenerated HTML docs for v2.31.0-121-g9198c

22 files changed, 110 insertions, 20 deletions

diff --git a/RelNotes/2.32.0.txt b/RelNotes/2.32.0.txt
index 6de5c3dac..aef141557 100644
--- a/RelNotes/2.32.0.txt
+++ b/RelNotes/2.32.0.txt
@@ -25,11 +25,26 @@ UI, Workflows & Features
 
  * "git log --format='...'" learned "%(describe)" placeholder.
 
+ * "git repack" so far has been only capable of repacking everything
+   under the sun into a single pack (or split by size).  A cleverer
+   strategy to reduce the cost of repacking a repository has been
+   introduced.
+
 
 Performance, Internal Implementation, Development Support etc.
 
  * Rename detection rework continues.
 
+ * GIT_TEST_FAIL_PREREQS is a mechanism to skip test pieces with
+   prerequisites to catch broken tests that depend on the side effects
+   of optional pieces, but did not work at all when negative
+   prerequisites were involved.
+   (merge 27d578d904 jk/fail-prereq-testfix later to maint).
+
+ * "git diff-index" codepath has been taught to trust fsmonitor status
+   to reduce number of lstat() calls.
+   (merge 7e5aa13d2c nk/diff-index-fsmonitor later to maint).
+
 
 Fixes since v2.31
 -----------------
@@ -97,3 +112,4 @@ Fixes since v2.31
    (merge ea7e63921c jr/doc-ignore-typofix later to maint).
    (merge 23c781f173 ps/update-ref-trans-hook-doc later to maint).
    (merge 42efa1231a jk/filter-branch-sha256 later to maint).
+   (merge 4c8e3dca6e tb/push-simple-uses-branch-merge-config later to maint).
diff --git a/git-pack-objects.html b/git-pack-objects.html
index 5445abd27..336b392ff 100644
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -857,6 +857,20 @@ base-name
 </p>

 </dd>

 <dt class="hdlist1">

+--stdin-packs

+</dt>

+<dd>

+<p>

+        Read the basenames of packfiles (e.g., <code>pack-1234abcd.pack</code>)

+        from the standard input, instead of object names or revision

+        arguments. The resulting pack contains all objects listed in the

+        included packs (those not beginning with <code>^</code>), excluding any

+        objects listed in the excluded packs (beginning with <code>^</code>).

+</p>

+<div class="paragraph"><p>Incompatible with <code>--revs</code>, or options that imply <code>--revs</code> (such as

+<code>--all</code>), with the exception of <code>--unpacked</code>, which is compatible.</p></div>

+</dd>

+<dt class="hdlist1">

 --window=&lt;n&gt;

 </dt>

 <dt class="hdlist1">

@@ -1338,7 +1352,7 @@ attribute <code>delta</code> set to false.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-02-25 17:29:29 PST

+ 2021-03-24 15:15:46 PDT

 </div>

 </div>

 </body>

diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index f85cb7ea9..25d9fbe37 100644
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -85,6 +85,16 @@ base-name::
 	reference was included in the resulting packfile.  This
 	can be useful to send new tags to native Git clients.
 
+--stdin-packs::
+	Read the basenames of packfiles (e.g., `pack-1234abcd.pack`)
+	from the standard input, instead of object names or revision
+	arguments. The resulting pack contains all objects listed in the
+	included packs (those not beginning with `^`), excluding any
+	objects listed in the excluded packs (beginning with `^`).
++
+Incompatible with `--revs`, or options that imply `--revs` (such as
+`--all`), with the exception of `--unpacked`, which is compatible.
+
 --window=<n>::
 --depth=<n>::
 	These two options affect how the objects contained in
diff --git a/git-push.html b/git-push.html
index 9a6904a8e..3b375790d 100644
--- a/git-push.html
+++ b/git-push.html
@@ -1793,7 +1793,7 @@ a case where you do mean to lose history.</p></div>
 <dd>

 <p>

         Without additional configuration, pushes the current branch to

-        the configured upstream (<code>remote.origin.merge</code> configuration

+        the configured upstream (<code>branch.&lt;name&gt;.merge</code> configuration

         variable) if it has the same name as the current branch, and

         errors out without pushing otherwise.

 </p>

@@ -1971,7 +1971,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-10-27 15:58:27 PDT

+ 2021-03-24 15:15:46 PDT

 </div>

 </div>

 </body>

diff --git a/git-push.txt b/git-push.txt
index ab103c82c..a953c7c38 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -600,7 +600,7 @@ EXAMPLES
 
 `git push origin`::
 	Without additional configuration, pushes the current branch to
-	the configured upstream (`remote.origin.merge` configuration
+	the configured upstream (`branch.<name>.merge` configuration
 	variable) if it has the same name as the current branch, and
 	errors out without pushing otherwise.
 +
diff --git a/git-repack.html b/git-repack.html
index 231a17c60..807d41359 100644
--- a/git-repack.html
+++ b/git-repack.html
@@ -1003,6 +1003,33 @@ depth is 4095.</p></div>
         <a href="git-pack-objects.html">git-pack-objects(1)</a>.

 </p>

 </dd>

+<dt class="hdlist1">

+-g=&lt;factor&gt;

+</dt>

+<dt class="hdlist1">

+--geometric=&lt;factor&gt;

+</dt>

+<dd>

+<p>

+        Arrange resulting pack structure so that each successive pack

+        contains at least <code>&lt;factor&gt;</code> times the number of objects as the

+        next-largest pack.

+</p>

+<div class="paragraph"><p><code>git repack</code> ensures this by determining a "cut" of packfiles that need

+to be repacked into one in order to ensure a geometric progression. It

+picks the smallest set of packfiles such that as many of the larger

+packfiles (by count of objects contained in that pack) may be left

+intact.</p></div>

+<div class="paragraph"><p>Unlike other repack modes, the set of objects to pack is determined

+uniquely by the set of packs being "rolled-up"; in other words, the

+packs determined to need to be combined in order to restore a geometric

+progression.</p></div>

+<div class="paragraph"><p>When <code>--unpacked</code> is specified, loose objects are implicitly included in

+this "roll-up", without respect to their reachability. This is subject

+to change in the future. This option (implying a drastically different

+repack mode) is not guaranteed to work with all other combinations of

+option to <code>git repack</code>).</p></div>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1043,7 +1070,7 @@ attribute <code>delta</code> set to false.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-02-25 17:29:29 PST

+ 2021-03-24 15:15:46 PDT

 </div>

 </div>

 </body>

diff --git a/git-repack.txt b/git-repack.txt
index fbd4b4ae0..317d63cf0 100644
--- a/git-repack.txt
+++ b/git-repack.txt
@@ -165,6 +165,29 @@ depth is 4095.
 	Pass the `--delta-islands` option to `git-pack-objects`, see
 	linkgit:git-pack-objects[1].
 
+-g=<factor>::
+--geometric=<factor>::
+	Arrange resulting pack structure so that each successive pack
+	contains at least `<factor>` times the number of objects as the
+	next-largest pack.
++
+`git repack` ensures this by determining a "cut" of packfiles that need
+to be repacked into one in order to ensure a geometric progression. It
+picks the smallest set of packfiles such that as many of the larger
+packfiles (by count of objects contained in that pack) may be left
+intact.
++
+Unlike other repack modes, the set of objects to pack is determined
+uniquely by the set of packs being "rolled-up"; in other words, the
+packs determined to need to be combined in order to restore a geometric
+progression.
++
+When `--unpacked` is specified, loose objects are implicitly included in
+this "roll-up", without respect to their reachability. This is subject
+to change in the future. This option (implying a drastically different
+repack mode) is not guaranteed to work with all other combinations of
+option to `git repack`).
+
 CONFIGURATION
 -------------
 
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index bac2a5bf9..368054aa4 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-03-22 14:18:27 PDT

+ 2021-03-24 15:17:15 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 5c022da1a..2088d864a 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-03-22 14:18:27 PDT

+ 2021-03-24 15:17:16 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index e37226104..bdbc63f44 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-03-22 14:18:24 PDT

+ 2021-03-24 15:17:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index c70e5e7e3..adc4f174c 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-03-22 14:18:27 PDT

+ 2021-03-24 15:17:15 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 6f179efe1..7d5103c1b 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-03-22 14:18:27 PDT

+ 2021-03-24 15:17:15 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 392bdfee3..b851ea1d1 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-03-22 14:18:26 PDT

+ 2021-03-24 15:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 95530831f..4ab48c2cd 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-03-22 14:18:27 PDT

+ 2021-03-24 15:17:15 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index e87f574a3..4d0548790 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-03-22 14:18:26 PDT

+ 2021-03-24 15:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index a546b35af..1d67be276 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-03-22 14:18:24 PDT

+ 2021-03-24 15:17:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 163c41b73..1ecc9d96e 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-03-22 14:18:26 PDT

+ 2021-03-24 15:17:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 7347e07a8..eb904face 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-03-22 14:18:25 PDT

+ 2021-03-24 15:17:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 3904ffdbb..3c12b7275 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-03-22 14:18:25 PDT

+ 2021-03-24 15:17:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index f4c24a149..e467b854c 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-03-22 14:18:25 PDT

+ 2021-03-24 15:17:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 85bd36df5..5b706fec2 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-03-22 14:18:24 PDT

+ 2021-03-24 15:17:10 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 d0ae93480..b83b86c00 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-03-22 14:18:25 PDT

+ 2021-03-24 15:17:10 PDT

 </div>

 </div>

 </body>