Autogenerated HTML docs for v2.31.1-305-gd1b10

19 files changed, 41 insertions, 27 deletions

diff --git a/RelNotes/2.32.0.txt b/RelNotes/2.32.0.txt
index 8670b7343..ea220f2a5 100644
--- a/RelNotes/2.32.0.txt
+++ b/RelNotes/2.32.0.txt
@@ -63,6 +63,18 @@ UI, Workflows & Features
  * "gitweb" learned "e-mail privacy" feature to redact strings that
    look like e-mail addresses on various pages.
 
+ * "git apply --3way" has always been "to fall back to 3-way merge
+   only when straight application fails". Swap the order of falling
+   back so that 3-way is always attempted first (only when the option
+   is given, of course) and then straight patch application is used as
+   a fallback when it fails.
+
+ * "git apply" now takes "--3way" and "--cached" at the same time, and
+   work and record results only in the index.
+
+ * The command line completion (in contrib/) has learned that
+   CHERRY_PICK_HEAD is a possible pseudo-ref.
+
 
 Performance, Internal Implementation, Development Support etc.
 
diff --git a/git-apply.html b/git-apply.html
index aa10073ae..f7a3cd87a 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -876,12 +876,13 @@ and does not require them to be in a Git repository.</p></div>
 </dt>

 <dd>

 <p>

-        When the patch does not apply cleanly, fall back on 3-way merge if

-        the patch records the identity of blobs it is supposed to apply to,

-        and we have those blobs available locally, possibly leaving the

+        Attempt 3-way merge if the patch records the identity of blobs it is supposed

+        to apply to and we have those blobs available locally, possibly leaving the

         conflict markers in the files in the working tree for the user to

-        resolve.  This option implies the <code>--index</code> option, and is incompatible

-        with the <code>--reject</code> and the <code>--cached</code> options.

+        resolve.  This option implies the <code>--index</code> option unless the

+        <code>--cached</code> option is used, and is incompatible with the <code>--reject</code> option.

+        When used with the <code>--cached</code> option, any conflicts are left at higher stages

+        in the cache.

 </p>

 </dd>

 <dt class="hdlist1">

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

 <div id="footer-text">

 Last updated

- 2020-08-31 16:12:31 PDT

+ 2021-04-15 14:08:03 PDT

 </div>

 </div>

 </body>

diff --git a/git-apply.txt b/git-apply.txt
index 91d9a8601..aa1ae56a2 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -84,12 +84,13 @@ OPTIONS
 
 -3::
 --3way::
-	When the patch does not apply cleanly, fall back on 3-way merge if
-	the patch records the identity of blobs it is supposed to apply to,
-	and we have those blobs available locally, possibly leaving the
+	Attempt 3-way merge if the patch records the identity of blobs it is supposed
+	to apply to and we have those blobs available locally, possibly leaving the
 	conflict markers in the files in the working tree for the user to
-	resolve.  This option implies the `--index` option, and is incompatible
-	with the `--reject` and the `--cached` options.
+	resolve.  This option implies the `--index` option unless the
+	`--cached` option is used, and is incompatible with the `--reject` option.
+	When used with the `--cached` option, any conflicts are left at higher stages
+	in the cache.
 
 --build-fake-ancestor=<file>::
 	Newer 'git diff' output has embedded 'index information'
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 02dd18cdc..ad482ee68 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-04-13 17:35:18 PDT

+ 2021-04-15 14:09:47 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 310efd5f9..a32d465ca 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-04-13 17:35:17 PDT

+ 2021-04-15 14:09:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index b2013dc4d..385b5ed32 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-04-13 17:35:18 PDT

+ 2021-04-15 14:09:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index ce3beff3c..7cac89b2e 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-04-13 17:35:14 PDT

+ 2021-04-15 14:09:39 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index a16335e7d..1ee494b1e 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-04-13 17:35:17 PDT

+ 2021-04-15 14:09:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 3a0814923..f5d92e866 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-04-13 17:35:17 PDT

+ 2021-04-15 14:09:45 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index ba2ad9bc4..3dca884e3 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-04-13 17:35:17 PDT

+ 2021-04-15 14:09:45 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 3873cb480..4c2599ed8 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-04-13 17:35:17 PDT

+ 2021-04-15 14:09:45 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 69d09a70c..db52261f8 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-04-13 17:35:16 PDT

+ 2021-04-15 14:09:44 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 82f52a98f..00e71d541 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-04-13 17:35:14 PDT

+ 2021-04-15 14:09:40 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 6b2191edf..3f0770b1c 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-04-13 17:35:16 PDT

+ 2021-04-15 14:09:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 67a327f73..274984564 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-04-13 17:35:15 PDT

+ 2021-04-15 14:09:42 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index de14b8672..d1a6a8a47 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-04-13 17:35:15 PDT

+ 2021-04-15 14:09:42 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 74eb4f181..ad8d89f62 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-04-13 17:35:15 PDT

+ 2021-04-15 14:09:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 4ef2e908a..969746451 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-04-13 17:35:14 PDT

+ 2021-04-15 14:09:40 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 f6dbfefe2..7ffb71e41 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-04-13 17:35:14 PDT

+ 2021-04-15 14:09:41 PDT

 </div>

 </div>

 </body>