Update 2 packages

mingw-w64-x86_64-git (2.34.0.rc2.windows.1-1 -> 2.34.0.1.7dad2af5e8-1) mingw-w64-x86_64-git-doc-html (2.34.0.rc2.windows.1-1 -> 2.34.0.1.7dad2af5e8-1) Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
awol96 · Nov 16, 2021 · f6f5d5a · f6f5d5a
1 parent a9a4b9b
commit f6f5d5a
Show file tree

Hide file tree

Showing 443 changed files with 277 additions and 286 deletions.
diff --git a/cmd/git-gui.exe b/cmd/git-gui.exe
diff --git a/cmd/git.exe b/cmd/git.exe
diff --git a/cmd/gitk.exe b/cmd/gitk.exe
diff --git a/git-bash.exe b/git-bash.exe
diff --git a/git-cmd.exe b/git-cmd.exe
diff --git a/mingw64/bin/git-cvsserver b/mingw64/bin/git-cvsserver
@@ -69,7 +69,7 @@ use File::Path qw/rmtree/;
 use File::Basename;
 use Getopt::Long qw(:config require_order no_ignore_case);
 
-my $VERSION = '2.34.0.rc2.windows.1';
+my $VERSION = '2.34.0.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;

diff --git a/mingw64/bin/git-receive-pack.exe b/mingw64/bin/git-receive-pack.exe
diff --git a/mingw64/bin/git-shell.exe b/mingw64/bin/git-shell.exe
diff --git a/mingw64/bin/git-upload-archive.exe b/mingw64/bin/git-upload-archive.exe
diff --git a/mingw64/bin/git-upload-pack.exe b/mingw64/bin/git-upload-pack.exe
diff --git a/mingw64/bin/git.exe b/mingw64/bin/git.exe
diff --git a/mingw64/libexec/git-core/git-add.exe b/mingw64/libexec/git-core/git-add.exe
diff --git a/mingw64/libexec/git-core/git-am.exe b/mingw64/libexec/git-core/git-am.exe
diff --git a/mingw64/libexec/git-core/git-annotate.exe b/mingw64/libexec/git-core/git-annotate.exe
diff --git a/mingw64/libexec/git-core/git-apply.exe b/mingw64/libexec/git-core/git-apply.exe
diff --git a/mingw64/libexec/git-core/git-archive.exe b/mingw64/libexec/git-core/git-archive.exe
diff --git a/mingw64/libexec/git-core/git-bisect--helper.exe b/mingw64/libexec/git-core/git-bisect--helper.exe
diff --git a/mingw64/libexec/git-core/git-blame.exe b/mingw64/libexec/git-core/git-blame.exe
diff --git a/mingw64/libexec/git-core/git-branch.exe b/mingw64/libexec/git-core/git-branch.exe
diff --git a/mingw64/libexec/git-core/git-bugreport.exe b/mingw64/libexec/git-core/git-bugreport.exe
diff --git a/mingw64/libexec/git-core/git-bundle.exe b/mingw64/libexec/git-core/git-bundle.exe
diff --git a/mingw64/libexec/git-core/git-cat-file.exe b/mingw64/libexec/git-core/git-cat-file.exe
diff --git a/mingw64/libexec/git-core/git-check-attr.exe b/mingw64/libexec/git-core/git-check-attr.exe
diff --git a/mingw64/libexec/git-core/git-check-ignore.exe b/mingw64/libexec/git-core/git-check-ignore.exe
diff --git a/mingw64/libexec/git-core/git-check-mailmap.exe b/mingw64/libexec/git-core/git-check-mailmap.exe
diff --git a/mingw64/libexec/git-core/git-check-ref-format.exe b/mingw64/libexec/git-core/git-check-ref-format.exe
diff --git a/mingw64/libexec/git-core/git-checkout--worker.exe b/mingw64/libexec/git-core/git-checkout--worker.exe
diff --git a/mingw64/libexec/git-core/git-checkout-index.exe b/mingw64/libexec/git-core/git-checkout-index.exe
diff --git a/mingw64/libexec/git-core/git-checkout.exe b/mingw64/libexec/git-core/git-checkout.exe
diff --git a/mingw64/libexec/git-core/git-cherry-pick.exe b/mingw64/libexec/git-core/git-cherry-pick.exe
diff --git a/mingw64/libexec/git-core/git-cherry.exe b/mingw64/libexec/git-core/git-cherry.exe
diff --git a/mingw64/libexec/git-core/git-clean.exe b/mingw64/libexec/git-core/git-clean.exe
diff --git a/mingw64/libexec/git-core/git-clone.exe b/mingw64/libexec/git-core/git-clone.exe
diff --git a/mingw64/libexec/git-core/git-column.exe b/mingw64/libexec/git-core/git-column.exe
diff --git a/mingw64/libexec/git-core/git-commit-graph.exe b/mingw64/libexec/git-core/git-commit-graph.exe
diff --git a/mingw64/libexec/git-core/git-commit-tree.exe b/mingw64/libexec/git-core/git-commit-tree.exe
diff --git a/mingw64/libexec/git-core/git-commit.exe b/mingw64/libexec/git-core/git-commit.exe
diff --git a/mingw64/libexec/git-core/git-config.exe b/mingw64/libexec/git-core/git-config.exe
diff --git a/mingw64/libexec/git-core/git-count-objects.exe b/mingw64/libexec/git-core/git-count-objects.exe
diff --git a/mingw64/libexec/git-core/git-credential-cache--daemon.exe b/mingw64/libexec/git-core/git-credential-cache--daemon.exe
diff --git a/mingw64/libexec/git-core/git-credential-cache.exe b/mingw64/libexec/git-core/git-credential-cache.exe
diff --git a/mingw64/libexec/git-core/git-credential-store.exe b/mingw64/libexec/git-core/git-credential-store.exe
diff --git a/mingw64/libexec/git-core/git-credential-wincred.exe b/mingw64/libexec/git-core/git-credential-wincred.exe
diff --git a/mingw64/libexec/git-core/git-credential.exe b/mingw64/libexec/git-core/git-credential.exe
diff --git a/mingw64/libexec/git-core/git-cvsserver b/mingw64/libexec/git-core/git-cvsserver
@@ -69,7 +69,7 @@ use File::Path qw/rmtree/;
 use File::Basename;
 use Getopt::Long qw(:config require_order no_ignore_case);
 
-my $VERSION = '2.34.0.rc2.windows.1';
+my $VERSION = '2.34.0.windows.1';
 
 my $log = GITCVS::log->new();
 my $cfg;

diff --git a/mingw64/libexec/git-core/git-daemon.exe b/mingw64/libexec/git-core/git-daemon.exe
diff --git a/mingw64/libexec/git-core/git-describe.exe b/mingw64/libexec/git-core/git-describe.exe
diff --git a/mingw64/libexec/git-core/git-diff-files.exe b/mingw64/libexec/git-core/git-diff-files.exe
diff --git a/mingw64/libexec/git-core/git-diff-index.exe b/mingw64/libexec/git-core/git-diff-index.exe
diff --git a/mingw64/libexec/git-core/git-diff-tree.exe b/mingw64/libexec/git-core/git-diff-tree.exe
diff --git a/mingw64/libexec/git-core/git-diff.exe b/mingw64/libexec/git-core/git-diff.exe
diff --git a/mingw64/libexec/git-core/git-difftool.exe b/mingw64/libexec/git-core/git-difftool.exe
diff --git a/mingw64/libexec/git-core/git-env--helper.exe b/mingw64/libexec/git-core/git-env--helper.exe
diff --git a/mingw64/libexec/git-core/git-fast-export.exe b/mingw64/libexec/git-core/git-fast-export.exe
diff --git a/mingw64/libexec/git-core/git-fast-import.exe b/mingw64/libexec/git-core/git-fast-import.exe
diff --git a/mingw64/libexec/git-core/git-fetch-pack.exe b/mingw64/libexec/git-core/git-fetch-pack.exe
diff --git a/mingw64/libexec/git-core/git-fetch.exe b/mingw64/libexec/git-core/git-fetch.exe
diff --git a/mingw64/libexec/git-core/git-fmt-merge-msg.exe b/mingw64/libexec/git-core/git-fmt-merge-msg.exe
diff --git a/mingw64/libexec/git-core/git-for-each-ref.exe b/mingw64/libexec/git-core/git-for-each-ref.exe
diff --git a/mingw64/libexec/git-core/git-for-each-repo.exe b/mingw64/libexec/git-core/git-for-each-repo.exe
diff --git a/mingw64/libexec/git-core/git-format-patch.exe b/mingw64/libexec/git-core/git-format-patch.exe
diff --git a/mingw64/libexec/git-core/git-fsck-objects.exe b/mingw64/libexec/git-core/git-fsck-objects.exe
diff --git a/mingw64/libexec/git-core/git-fsck.exe b/mingw64/libexec/git-core/git-fsck.exe
diff --git a/mingw64/libexec/git-core/git-fsmonitor--daemon.exe b/mingw64/libexec/git-core/git-fsmonitor--daemon.exe
diff --git a/mingw64/libexec/git-core/git-gc.exe b/mingw64/libexec/git-core/git-gc.exe
diff --git a/mingw64/libexec/git-core/git-get-tar-commit-id.exe b/mingw64/libexec/git-core/git-get-tar-commit-id.exe
diff --git a/mingw64/libexec/git-core/git-grep.exe b/mingw64/libexec/git-core/git-grep.exe
diff --git a/mingw64/libexec/git-core/git-hash-object.exe b/mingw64/libexec/git-core/git-hash-object.exe
diff --git a/mingw64/libexec/git-core/git-help.exe b/mingw64/libexec/git-core/git-help.exe
diff --git a/mingw64/libexec/git-core/git-http-backend.exe b/mingw64/libexec/git-core/git-http-backend.exe
diff --git a/mingw64/libexec/git-core/git-http-fetch.exe b/mingw64/libexec/git-core/git-http-fetch.exe
diff --git a/mingw64/libexec/git-core/git-http-push.exe b/mingw64/libexec/git-core/git-http-push.exe
diff --git a/mingw64/libexec/git-core/git-imap-send.exe b/mingw64/libexec/git-core/git-imap-send.exe
diff --git a/mingw64/libexec/git-core/git-index-pack.exe b/mingw64/libexec/git-core/git-index-pack.exe
diff --git a/mingw64/libexec/git-core/git-init-db.exe b/mingw64/libexec/git-core/git-init-db.exe
diff --git a/mingw64/libexec/git-core/git-init.exe b/mingw64/libexec/git-core/git-init.exe
diff --git a/mingw64/libexec/git-core/git-interpret-trailers.exe b/mingw64/libexec/git-core/git-interpret-trailers.exe
diff --git a/mingw64/libexec/git-core/git-log.exe b/mingw64/libexec/git-core/git-log.exe
diff --git a/mingw64/libexec/git-core/git-ls-files.exe b/mingw64/libexec/git-core/git-ls-files.exe
diff --git a/mingw64/libexec/git-core/git-ls-remote.exe b/mingw64/libexec/git-core/git-ls-remote.exe
diff --git a/mingw64/libexec/git-core/git-ls-tree.exe b/mingw64/libexec/git-core/git-ls-tree.exe
diff --git a/mingw64/libexec/git-core/git-mailinfo.exe b/mingw64/libexec/git-core/git-mailinfo.exe
diff --git a/mingw64/libexec/git-core/git-mailsplit.exe b/mingw64/libexec/git-core/git-mailsplit.exe
diff --git a/mingw64/libexec/git-core/git-maintenance.exe b/mingw64/libexec/git-core/git-maintenance.exe
diff --git a/mingw64/libexec/git-core/git-merge-base.exe b/mingw64/libexec/git-core/git-merge-base.exe
diff --git a/mingw64/libexec/git-core/git-merge-file.exe b/mingw64/libexec/git-core/git-merge-file.exe
diff --git a/mingw64/libexec/git-core/git-merge-index.exe b/mingw64/libexec/git-core/git-merge-index.exe
diff --git a/mingw64/libexec/git-core/git-merge-ours.exe b/mingw64/libexec/git-core/git-merge-ours.exe
diff --git a/mingw64/libexec/git-core/git-merge-recursive.exe b/mingw64/libexec/git-core/git-merge-recursive.exe
diff --git a/mingw64/libexec/git-core/git-merge-subtree.exe b/mingw64/libexec/git-core/git-merge-subtree.exe
diff --git a/mingw64/libexec/git-core/git-merge-tree.exe b/mingw64/libexec/git-core/git-merge-tree.exe
diff --git a/mingw64/libexec/git-core/git-merge.exe b/mingw64/libexec/git-core/git-merge.exe
diff --git a/mingw64/libexec/git-core/git-mktag.exe b/mingw64/libexec/git-core/git-mktag.exe
diff --git a/mingw64/libexec/git-core/git-mktree.exe b/mingw64/libexec/git-core/git-mktree.exe
diff --git a/mingw64/libexec/git-core/git-multi-pack-index.exe b/mingw64/libexec/git-core/git-multi-pack-index.exe
diff --git a/mingw64/libexec/git-core/git-mv.exe b/mingw64/libexec/git-core/git-mv.exe
diff --git a/mingw64/libexec/git-core/git-name-rev.exe b/mingw64/libexec/git-core/git-name-rev.exe
diff --git a/mingw64/libexec/git-core/git-notes.exe b/mingw64/libexec/git-core/git-notes.exe
diff --git a/mingw64/libexec/git-core/git-pack-objects.exe b/mingw64/libexec/git-core/git-pack-objects.exe
diff --git a/mingw64/libexec/git-core/git-pack-redundant.exe b/mingw64/libexec/git-core/git-pack-redundant.exe
diff --git a/mingw64/libexec/git-core/git-pack-refs.exe b/mingw64/libexec/git-core/git-pack-refs.exe
diff --git a/mingw64/libexec/git-core/git-patch-id.exe b/mingw64/libexec/git-core/git-patch-id.exe
diff --git a/mingw64/libexec/git-core/git-prune-packed.exe b/mingw64/libexec/git-core/git-prune-packed.exe
diff --git a/mingw64/libexec/git-core/git-prune.exe b/mingw64/libexec/git-core/git-prune.exe
diff --git a/mingw64/libexec/git-core/git-pull.exe b/mingw64/libexec/git-core/git-pull.exe
diff --git a/mingw64/libexec/git-core/git-push.exe b/mingw64/libexec/git-core/git-push.exe
diff --git a/mingw64/libexec/git-core/git-range-diff.exe b/mingw64/libexec/git-core/git-range-diff.exe
diff --git a/mingw64/libexec/git-core/git-read-tree.exe b/mingw64/libexec/git-core/git-read-tree.exe
diff --git a/mingw64/libexec/git-core/git-rebase.exe b/mingw64/libexec/git-core/git-rebase.exe
diff --git a/mingw64/libexec/git-core/git-receive-pack.exe b/mingw64/libexec/git-core/git-receive-pack.exe
diff --git a/mingw64/libexec/git-core/git-reflog.exe b/mingw64/libexec/git-core/git-reflog.exe
diff --git a/mingw64/libexec/git-core/git-remote-ext.exe b/mingw64/libexec/git-core/git-remote-ext.exe
diff --git a/mingw64/libexec/git-core/git-remote-fd.exe b/mingw64/libexec/git-core/git-remote-fd.exe
diff --git a/mingw64/libexec/git-core/git-remote-ftp.exe b/mingw64/libexec/git-core/git-remote-ftp.exe
diff --git a/mingw64/libexec/git-core/git-remote-ftps.exe b/mingw64/libexec/git-core/git-remote-ftps.exe
diff --git a/mingw64/libexec/git-core/git-remote-http.exe b/mingw64/libexec/git-core/git-remote-http.exe
diff --git a/mingw64/libexec/git-core/git-remote-https.exe b/mingw64/libexec/git-core/git-remote-https.exe
diff --git a/mingw64/libexec/git-core/git-remote.exe b/mingw64/libexec/git-core/git-remote.exe
diff --git a/mingw64/libexec/git-core/git-repack.exe b/mingw64/libexec/git-core/git-repack.exe
diff --git a/mingw64/libexec/git-core/git-replace.exe b/mingw64/libexec/git-core/git-replace.exe
diff --git a/mingw64/libexec/git-core/git-rerere.exe b/mingw64/libexec/git-core/git-rerere.exe
diff --git a/mingw64/libexec/git-core/git-reset.exe b/mingw64/libexec/git-core/git-reset.exe
diff --git a/mingw64/libexec/git-core/git-restore.exe b/mingw64/libexec/git-core/git-restore.exe
diff --git a/mingw64/libexec/git-core/git-rev-list.exe b/mingw64/libexec/git-core/git-rev-list.exe
diff --git a/mingw64/libexec/git-core/git-rev-parse.exe b/mingw64/libexec/git-core/git-rev-parse.exe
diff --git a/mingw64/libexec/git-core/git-revert.exe b/mingw64/libexec/git-core/git-revert.exe
diff --git a/mingw64/libexec/git-core/git-rm.exe b/mingw64/libexec/git-core/git-rm.exe
diff --git a/mingw64/libexec/git-core/git-send-email b/mingw64/libexec/git-core/git-send-email
@@ -1521,7 +1521,7 @@ sub send_message {
 	@recipients = unique_email_list(@recipients,@cc,@initial_bcc);
 	@recipients = (map { extract_valid_address_or_die($_) } @recipients);
 	my $date = format_2822_time($time++);
-	my $gitversion = '2.34.0.rc2.windows.1';
+	my $gitversion = '2.34.0.windows.1';
 	if ($gitversion =~ m/..GIT_VERSION../) {
 	    $gitversion = Git::version();
 	}

diff --git a/mingw64/libexec/git-core/git-send-pack.exe b/mingw64/libexec/git-core/git-send-pack.exe
diff --git a/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe b/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe
diff --git a/mingw64/libexec/git-core/git-shell.exe b/mingw64/libexec/git-core/git-shell.exe
diff --git a/mingw64/libexec/git-core/git-shortlog.exe b/mingw64/libexec/git-core/git-shortlog.exe
diff --git a/mingw64/libexec/git-core/git-show-branch.exe b/mingw64/libexec/git-core/git-show-branch.exe
diff --git a/mingw64/libexec/git-core/git-show-index.exe b/mingw64/libexec/git-core/git-show-index.exe
diff --git a/mingw64/libexec/git-core/git-show-ref.exe b/mingw64/libexec/git-core/git-show-ref.exe
diff --git a/mingw64/libexec/git-core/git-show.exe b/mingw64/libexec/git-core/git-show.exe
diff --git a/mingw64/libexec/git-core/git-sparse-checkout.exe b/mingw64/libexec/git-core/git-sparse-checkout.exe
diff --git a/mingw64/libexec/git-core/git-stage.exe b/mingw64/libexec/git-core/git-stage.exe
diff --git a/mingw64/libexec/git-core/git-stash.exe b/mingw64/libexec/git-core/git-stash.exe
diff --git a/mingw64/libexec/git-core/git-status.exe b/mingw64/libexec/git-core/git-status.exe
diff --git a/mingw64/libexec/git-core/git-stripspace.exe b/mingw64/libexec/git-core/git-stripspace.exe
diff --git a/mingw64/libexec/git-core/git-submodule--helper.exe b/mingw64/libexec/git-core/git-submodule--helper.exe
diff --git a/mingw64/libexec/git-core/git-svn b/mingw64/libexec/git-core/git-svn
@@ -52,7 +52,7 @@ use vars qw/	$AUTHOR $VERSION
 		$_revision $_repository
 		$_q $_authors $_authors_prog %users/;
 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
-$VERSION = '2.34.0.rc2.windows.1';
+$VERSION = '2.34.0.windows.1';
 
 use Carp qw/croak/;
 use File::Basename qw/dirname basename/;

diff --git a/mingw64/libexec/git-core/git-switch.exe b/mingw64/libexec/git-core/git-switch.exe
diff --git a/mingw64/libexec/git-core/git-symbolic-ref.exe b/mingw64/libexec/git-core/git-symbolic-ref.exe
diff --git a/mingw64/libexec/git-core/git-tag.exe b/mingw64/libexec/git-core/git-tag.exe
diff --git a/mingw64/libexec/git-core/git-unpack-file.exe b/mingw64/libexec/git-core/git-unpack-file.exe
diff --git a/mingw64/libexec/git-core/git-unpack-objects.exe b/mingw64/libexec/git-core/git-unpack-objects.exe
diff --git a/mingw64/libexec/git-core/git-update-index.exe b/mingw64/libexec/git-core/git-update-index.exe
diff --git a/mingw64/libexec/git-core/git-update-ref.exe b/mingw64/libexec/git-core/git-update-ref.exe
diff --git a/mingw64/libexec/git-core/git-update-server-info.exe b/mingw64/libexec/git-core/git-update-server-info.exe
diff --git a/mingw64/libexec/git-core/git-upload-archive.exe b/mingw64/libexec/git-core/git-upload-archive.exe
diff --git a/mingw64/libexec/git-core/git-upload-pack.exe b/mingw64/libexec/git-core/git-upload-pack.exe
diff --git a/mingw64/libexec/git-core/git-var.exe b/mingw64/libexec/git-core/git-var.exe
diff --git a/mingw64/libexec/git-core/git-verify-commit.exe b/mingw64/libexec/git-core/git-verify-commit.exe
diff --git a/mingw64/libexec/git-core/git-verify-pack.exe b/mingw64/libexec/git-core/git-verify-pack.exe
diff --git a/mingw64/libexec/git-core/git-verify-tag.exe b/mingw64/libexec/git-core/git-verify-tag.exe
diff --git a/mingw64/libexec/git-core/git-whatchanged.exe b/mingw64/libexec/git-core/git-whatchanged.exe
diff --git a/mingw64/libexec/git-core/git-worktree.exe b/mingw64/libexec/git-core/git-worktree.exe
diff --git a/mingw64/libexec/git-core/git-write-tree.exe b/mingw64/libexec/git-core/git-write-tree.exe
diff --git a/mingw64/libexec/git-core/git.exe b/mingw64/libexec/git-core/git.exe
diff --git a/mingw64/libexec/git-core/headless-git.exe b/mingw64/libexec/git-core/headless-git.exe
diff --git a/mingw64/share/doc/git-doc/MyFirstContribution.html b/mingw64/share/doc/git-doc/MyFirstContribution.html
@@ -2030,7 +2030,7 @@ <h3 id="after-approval"><a class="anchor" href="#after-approval"></a>After Revie
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/MyFirstObjectWalk.html b/mingw64/share/doc/git-doc/MyFirstObjectWalk.html
@@ -1644,7 +1644,7 @@ <h2 id="_wrapping_up">Wrapping Up</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/RelNotes/2.34.0.txt b/mingw64/share/doc/git-doc/RelNotes/2.34.0.txt
@@ -15,7 +15,8 @@ UI, Workflows & Features
    location relative to Git installation (e.g. its $sharedir which is
    $(prefix)/share), with "%(prefix)".
 
- * Use `ort` instead of `recursive` as the default merge strategy.
+ * The `ort` strategy is used instead of `recursive` as the default
+   merge strategy.
 
  * The userdiff pattern for "java" language has been updated.
 
@@ -77,7 +78,10 @@ UI, Workflows & Features
  * "git fsck" has been taught to report mismatch between expected and
    actual types of an object better.
 
- * Use ssh public crypto for object and push-cert signing.
+ * In addition to GnuPG, ssh public crypto can be used for object and
+   push-cert signing.  Note that this feature cannot be used with
+   ssh-keygen from OpenSSH 8.7, whose support for it is broken.  Avoid
+   using it unless you update to OpenSSH 8.8.
 
  * "git log --grep=string --author=name" learns to highlight hits just
    like "git grep string" does.
@@ -182,7 +186,7 @@ Performance, Internal Implementation, Development Support etc.
  * Prevent "make sparse" from running for the source files that
    haven't been modified.
 
- * The codepath to write a new version of .midx multi-pack index files
+ * The code path to write a new version of .midx multi-pack index files
    has learned to release the mmaped memory holding the current
    version of .midx before removing them from the disk, as some
    platforms do not allow removal of a file that still has mapping.
@@ -260,12 +264,8 @@ Fixes since v2.33
  * The output from "git fast-export", when its anonymization feature
    is in use, showed an annotated tag incorrectly.
 
- * Doc update plus improved error reporting.
-
  * Recent "diff -m" changes broke "gitk", which has been corrected.
 
- * Regression fix.
-
  * The "git apply -3" code path learned not to bother the lower level
    merge machinery when the three-way merge can be trivially resolved
    without the content level merge.  This fixes a regression caused by
@@ -391,7 +391,6 @@ Fixes since v2.33
    (merge 8252ec300e jc/branch-copy-doc later to maint).
 
  * Squelch over-eager warning message added during this cycle.
-   (merge 9e8fe7b1c7 jk/log-warn-on-bogus-encoding later to maint).
 
  * Fix long-standing shell syntax error in the completion script.
    (merge 46b0585286 re/completion-fix-test-equality later to maint).
@@ -405,8 +404,21 @@ Fixes since v2.33
    (merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint).
 
  * One CI task based on Fedora image noticed a not-quite-kosher
-   consturct recently, which has been corrected.
-   (merge 4b540cf913 vd/pthread-setspecific-g11-fix later to maint).
+   construct recently, which has been corrected.
+
+ * "git pull --ff-only" and "git pull --rebase --ff-only" should make
+   it a no-op to attempt pulling from a remote that is behind us, but
+   instead the command errored out by saying it was impossible to
+   fast-forward, which may technically be true, but not a useful thing
+   to diagnose as an error.  This has been corrected.
+   (merge 361cb52383 jc/fix-pull-ff-only-when-already-up-to-date later to maint).
+
+ * The way Cygwin emulates a unix-domain socket, on top of which the
+   simple-ipc mechanism is implemented, can race with the program on
+   the other side that wants to use the socket, and briefly make it
+   appear as a regular file before lstat(2) starts reporting it as a
+   socket.  We now have a workaround on the side that connects to a
+   unix domain socket.
 
  * Other code cleanup, docfix, build fix, etc.
    (merge f188160be9 ab/bundle-remove-verbose-option later to maint).
@@ -422,6 +434,5 @@ Fixes since v2.33
    (merge 8650c6298c ab/fix-make-lint-docs later to maint).
    (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/mingw64/share/doc/git-doc/SubmittingPatches.html b/mingw64/share/doc/git-doc/SubmittingPatches.html
@@ -1184,7 +1184,7 @@ <h3 id="_gnus">Gnus</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/everyday.html b/mingw64/share/doc/git-doc/everyday.html
@@ -453,7 +453,7 @@ <h1>Everyday Git With 20 Commands Or So</h1>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-add.html b/mingw64/share/doc/git-doc/git-add.html
@@ -1000,7 +1000,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-am.html b/mingw64/share/doc/git-doc/git-am.html
@@ -775,7 +775,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-annotate.html b/mingw64/share/doc/git-doc/git-annotate.html
@@ -713,7 +713,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-apply.html b/mingw64/share/doc/git-doc/git-apply.html
@@ -813,7 +813,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-archimport.html b/mingw64/share/doc/git-doc/git-archimport.html
@@ -587,7 +587,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-archive.html b/mingw64/share/doc/git-doc/git-archive.html
@@ -722,7 +722,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bash.html b/mingw64/share/doc/git-doc/git-bash.html
@@ -575,7 +575,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bisect-lk2009.html b/mingw64/share/doc/git-doc/git-bisect-lk2009.html
@@ -2129,7 +2129,7 @@ <h2 id="_references">References</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bisect.html b/mingw64/share/doc/git-doc/git-bisect.html
@@ -1079,7 +1079,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-blame.html b/mingw64/share/doc/git-doc/git-blame.html
@@ -1035,7 +1035,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-branch.html b/mingw64/share/doc/git-doc/git-branch.html
@@ -951,7 +951,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bugreport.html b/mingw64/share/doc/git-doc/git-bugreport.html
@@ -540,7 +540,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-bundle.html b/mingw64/share/doc/git-doc/git-bundle.html
@@ -865,7 +865,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-cat-file.html b/mingw64/share/doc/git-doc/git-cat-file.html
@@ -878,7 +878,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-check-attr.html b/mingw64/share/doc/git-doc/git-check-attr.html
@@ -648,7 +648,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-check-ignore.html b/mingw64/share/doc/git-doc/git-check-ignore.html
@@ -614,7 +614,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-check-mailmap.html b/mingw64/share/doc/git-doc/git-check-mailmap.html
@@ -515,7 +515,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-check-ref-format.html b/mingw64/share/doc/git-doc/git-check-ref-format.html
@@ -637,7 +637,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-checkout-index.html b/mingw64/share/doc/git-doc/git-checkout-index.html
@@ -682,7 +682,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-checkout.html b/mingw64/share/doc/git-doc/git-checkout.html
@@ -1200,7 +1200,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-cherry-pick.html b/mingw64/share/doc/git-doc/git-cherry-pick.html
@@ -787,7 +787,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-cherry.html b/mingw64/share/doc/git-doc/git-cherry.html
@@ -627,7 +627,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-citool.html b/mingw64/share/doc/git-doc/git-citool.html
@@ -478,7 +478,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-clean.html b/mingw64/share/doc/git-doc/git-clean.html
@@ -626,7 +626,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-clone.html b/mingw64/share/doc/git-doc/git-clone.html
@@ -1032,7 +1032,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-column.html b/mingw64/share/doc/git-doc/git-column.html
@@ -556,7 +556,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>

diff --git a/mingw64/share/doc/git-doc/git-commit-graph.html b/mingw64/share/doc/git-doc/git-commit-graph.html
@@ -640,7 +640,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-11-10 02:43:22 UTC
+Last updated 2021-11-15 18:31:18 UTC
 </div>
 </div>
 </body>