Autogenerated HTML docs for v2.34.1-390-g2ae0a

19 files changed, 62 insertions, 19 deletions

diff --git a/RelNotes/2.35.0.txt b/RelNotes/2.35.0.txt
index 217334c93..dc72843e1 100644
--- a/RelNotes/2.35.0.txt
+++ b/RelNotes/2.35.0.txt
@@ -58,6 +58,10 @@ UI, Workflows & Features
  * "git name-rev" has been tweaked to give output that is shorter and
    easier to understand.
 
+ * "git apply" has been taught to ignore a message without a patch
+   with the "--allow-empty" option.  It also learned to honor the
+   "--quiet" option given from the command line.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -122,6 +126,10 @@ Performance, Internal Implementation, Development Support etc.
  * diff and blame commands have been taught to work better with sparse
    index.
 
+ * The chainlint test script linter in the test suite has been updated.
+
+ * The DEVELOPER=yes build uses -std=gnu99 now.
+
 
 Fixes since v2.34
 -----------------
@@ -241,6 +249,11 @@ Fixes since v2.34
    to read and honor the settings given by the "--decorate-refs"
    option.
 
+ * "git fetch --set-upstream" did not check if there is a current
+   branch, leading to a segfault when it is run on a detached HEAD,
+   which has been corrected.
+   (merge 17baeaf82d ab/fetch-set-upstream-while-detached later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 74db416c9c cw/protocol-v2-doc-fix later to maint).
    (merge f9b2b6684d ja/doc-cleanup later to maint).
diff --git a/git-apply.html b/git-apply.html
index 879e1c813..1087f69c8 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -756,7 +756,7 @@ git-apply(1) Manual Page
           [--ignore-space-change | --ignore-whitespace]

           [--whitespace=(nowarn|warn|fix|error|error-all)]

           [--exclude=<path>] [--include=<path>] [--directory=<root>]

-          [--verbose] [--unsafe-paths] [&lt;patch&gt;&#8230;]</pre>

+          [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [&lt;patch&gt;&#8230;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -1125,6 +1125,18 @@ behavior:</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+-q

+</dt>

+<dt class="hdlist1">

+--quiet

+</dt>

+<dd>

+<p>

+        Suppress stderr output. Messages about patch status and progress

+        will not be printed.

+</p>

+</dd>

+<dt class="hdlist1">

 --recount

 </dt>

 <dd>

@@ -1160,6 +1172,15 @@ running <code>git apply --directory=modules/git-gui</code>.</p></div>
 the <code>--unsafe-paths</code> option to override this safety check.  This option

 has no effect when <code>--index</code> or <code>--cached</code> is in use.</p></div>

 </dd>

+<dt class="hdlist1">

+--allow-empty

+</dt>

+<dd>

+<p>

+        Don&#8217;t return error for patches containing no diff. This includes

+        empty patches and patches with commit text only.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1221,7 +1242,7 @@ subdirectory is checked and (if possible) updated.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-04-16 15:42:56 PDT

+ 2021-12-23 00:29:30 PST

 </div>

 </div>

 </body>

diff --git a/git-apply.txt b/git-apply.txt
index aa1ae56a2..b6d77f420 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -16,7 +16,7 @@ SYNOPSIS
 	  [--ignore-space-change | --ignore-whitespace]
 	  [--whitespace=(nowarn|warn|fix|error|error-all)]
 	  [--exclude=<path>] [--include=<path>] [--directory=<root>]
-	  [--verbose] [--unsafe-paths] [<patch>...]
+	  [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -228,6 +228,11 @@ behavior:
 	current patch being applied will be printed. This option will cause
 	additional information to be reported.
 
+-q::
+--quiet::
+	Suppress stderr output. Messages about patch status and progress
+	will not be printed.
+
 --recount::
 	Do not trust the line counts in the hunk headers, but infer them
 	by inspecting the patch (e.g. after editing the patch without
@@ -251,6 +256,10 @@ When `git apply` is used as a "better GNU patch", the user can pass
 the `--unsafe-paths` option to override this safety check.  This option
 has no effect when `--index` or `--cached` is in use.
 
+--allow-empty::
+	Don't return error for patches containing no diff. This includes
+	empty patches and patches with commit text only.
+
 CONFIGURATION
 -------------
 
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index ee373327d..1d375d6a7 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-12-21 17:03:45 PST

+ 2021-12-23 00:29:55 PST

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index b43bee73f..ebce36fb8 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-12-21 17:03:45 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index d123217b4..be3bf4a12 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-12-21 17:03:45 PST

+ 2021-12-23 00:29:55 PST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index f6cd385e8..ca850876d 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-12-21 17:03:43 PST

+ 2021-12-23 00:29:53 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 1ab222b20..414f52db3 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-12-21 17:03:45 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index db444df90..06114d55b 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index bb03f47c1..6b122840b 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 5b1b8de43..7cd66a3f7 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 4c20360b3..64ad7137c 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 07602fd23..265683242 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-12-21 17:03:43 PST

+ 2021-12-23 00:29:53 PST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index ef61a9f94..5143a8b5b 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 098c22ded..1ea42eb61 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index c638ecfdc..34d226c5b 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:54 PST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index cb2ebd639..1f9095515 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-12-21 17:03:44 PST

+ 2021-12-23 00:29:53 PST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 7c36921ad..1c8a700dc 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-12-21 17:03:43 PST

+ 2021-12-23 00:29:53 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 e16b4e838..96d89b29d 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-12-21 17:03:43 PST

+ 2021-12-23 00:29:53 PST

 </div>

 </div>

 </body>