diff --git a/cmd/git-gui.exe b/cmd/git-gui.exe index b07ab73fbea..383c7941842 100755 Binary files a/cmd/git-gui.exe and b/cmd/git-gui.exe differ diff --git a/cmd/git-receive-pack.exe b/cmd/git-receive-pack.exe index 0093b56184c..2e2c13be17b 100644 Binary files a/cmd/git-receive-pack.exe and b/cmd/git-receive-pack.exe differ diff --git a/cmd/git-upload-pack.exe b/cmd/git-upload-pack.exe index aad6123cee2..b09e96085de 100644 Binary files a/cmd/git-upload-pack.exe and b/cmd/git-upload-pack.exe differ diff --git a/cmd/git.exe b/cmd/git.exe index 12fcc9c66ba..d729abfdc2e 100755 Binary files a/cmd/git.exe and b/cmd/git.exe differ diff --git a/cmd/gitk.exe b/cmd/gitk.exe index f8369d477ee..71a95369d21 100755 Binary files a/cmd/gitk.exe and b/cmd/gitk.exe differ diff --git a/cmd/scalar.exe b/cmd/scalar.exe index 12fcc9c66ba..d729abfdc2e 100644 Binary files a/cmd/scalar.exe and b/cmd/scalar.exe differ diff --git a/cmd/tig.exe b/cmd/tig.exe index 0c9a0632870..5e2d4adfa1d 100644 Binary files a/cmd/tig.exe and b/cmd/tig.exe differ diff --git a/git-bash.exe b/git-bash.exe index 58d9bcf9dde..df36e5019bb 100755 Binary files a/git-bash.exe and b/git-bash.exe differ diff --git a/git-cmd.exe b/git-cmd.exe index e46cc2e89cf..3599b4be6f4 100755 Binary files a/git-cmd.exe and b/git-cmd.exe differ diff --git a/mingw64/bin/git-cvsserver b/mingw64/bin/git-cvsserver index f518d6c2878..9a9945c4bf6 100755 --- 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.46.0.windows.1'; +my $VERSION = '2.46.1.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 index 521c279a765..dacc3f1cd2e 100755 Binary files a/mingw64/bin/git-receive-pack.exe and b/mingw64/bin/git-receive-pack.exe differ diff --git a/mingw64/bin/git-shell.exe b/mingw64/bin/git-shell.exe index b6184026d40..6eb64818f6c 100755 Binary files a/mingw64/bin/git-shell.exe and b/mingw64/bin/git-shell.exe differ diff --git a/mingw64/bin/git-upload-archive.exe b/mingw64/bin/git-upload-archive.exe index 521c279a765..dacc3f1cd2e 100755 Binary files a/mingw64/bin/git-upload-archive.exe and b/mingw64/bin/git-upload-archive.exe differ diff --git a/mingw64/bin/git-upload-pack.exe b/mingw64/bin/git-upload-pack.exe index 521c279a765..dacc3f1cd2e 100755 Binary files a/mingw64/bin/git-upload-pack.exe and b/mingw64/bin/git-upload-pack.exe differ diff --git a/mingw64/bin/git.exe b/mingw64/bin/git.exe index 93ded5099d6..a8d49ed25a1 100755 Binary files a/mingw64/bin/git.exe and b/mingw64/bin/git.exe differ diff --git a/mingw64/bin/scalar.exe b/mingw64/bin/scalar.exe index fb6cb722019..45c1ebb5a57 100644 Binary files a/mingw64/bin/scalar.exe and b/mingw64/bin/scalar.exe differ diff --git a/mingw64/libexec/git-core/git-credential-wincred.exe b/mingw64/libexec/git-core/git-credential-wincred.exe index 6a11457df50..973e0b1ca43 100755 Binary files a/mingw64/libexec/git-core/git-credential-wincred.exe and b/mingw64/libexec/git-core/git-credential-wincred.exe differ diff --git a/mingw64/libexec/git-core/git-cvsserver b/mingw64/libexec/git-core/git-cvsserver index f518d6c2878..9a9945c4bf6 100755 --- 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.46.0.windows.1'; +my $VERSION = '2.46.1.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 index bfd501a24b8..896c74f3182 100755 Binary files a/mingw64/libexec/git-core/git-daemon.exe and b/mingw64/libexec/git-core/git-daemon.exe differ diff --git a/mingw64/libexec/git-core/git-http-backend.exe b/mingw64/libexec/git-core/git-http-backend.exe index a67cb09d6c8..fce7eccdca2 100755 Binary files a/mingw64/libexec/git-core/git-http-backend.exe and b/mingw64/libexec/git-core/git-http-backend.exe differ diff --git a/mingw64/libexec/git-core/git-http-fetch.exe b/mingw64/libexec/git-core/git-http-fetch.exe index 0afe4b8f4be..230456c2418 100755 Binary files a/mingw64/libexec/git-core/git-http-fetch.exe and b/mingw64/libexec/git-core/git-http-fetch.exe differ diff --git a/mingw64/libexec/git-core/git-http-push.exe b/mingw64/libexec/git-core/git-http-push.exe index bf2ea0f3af5..a776faf0e2b 100755 Binary files a/mingw64/libexec/git-core/git-http-push.exe and b/mingw64/libexec/git-core/git-http-push.exe differ diff --git a/mingw64/libexec/git-core/git-imap-send.exe b/mingw64/libexec/git-core/git-imap-send.exe index 89efa4971ce..cd929955eae 100755 Binary files a/mingw64/libexec/git-core/git-imap-send.exe and b/mingw64/libexec/git-core/git-imap-send.exe differ diff --git a/mingw64/libexec/git-core/git-remote-ftp.exe b/mingw64/libexec/git-core/git-remote-ftp.exe index 828108aa538..ce67b3f0a55 100755 Binary files a/mingw64/libexec/git-core/git-remote-ftp.exe and b/mingw64/libexec/git-core/git-remote-ftp.exe differ diff --git a/mingw64/libexec/git-core/git-remote-ftps.exe b/mingw64/libexec/git-core/git-remote-ftps.exe index 828108aa538..ce67b3f0a55 100755 Binary files a/mingw64/libexec/git-core/git-remote-ftps.exe and b/mingw64/libexec/git-core/git-remote-ftps.exe differ diff --git a/mingw64/libexec/git-core/git-remote-http.exe b/mingw64/libexec/git-core/git-remote-http.exe index 828108aa538..ce67b3f0a55 100755 Binary files a/mingw64/libexec/git-core/git-remote-http.exe and b/mingw64/libexec/git-core/git-remote-http.exe differ diff --git a/mingw64/libexec/git-core/git-remote-https.exe b/mingw64/libexec/git-core/git-remote-https.exe index 828108aa538..ce67b3f0a55 100755 Binary files a/mingw64/libexec/git-core/git-remote-https.exe and b/mingw64/libexec/git-core/git-remote-https.exe differ diff --git a/mingw64/libexec/git-core/git-send-email b/mingw64/libexec/git-core/git-send-email index 9351850a879..f4b58d07fd5 100755 --- a/mingw64/libexec/git-core/git-send-email +++ b/mingw64/libexec/git-core/git-send-email @@ -1505,7 +1505,7 @@ sub gen_header { @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.46.0.windows.1'; + my $gitversion = '2.46.1.windows.1'; if ($gitversion =~ m/..GIT_VERSION../) { $gitversion = Git::version(); } diff --git a/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe b/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe index 21acc8dcf2e..a0426b402c8 100755 Binary files a/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe and b/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe differ diff --git a/mingw64/libexec/git-core/git-shell.exe b/mingw64/libexec/git-core/git-shell.exe index b6184026d40..6eb64818f6c 100755 Binary files a/mingw64/libexec/git-core/git-shell.exe and b/mingw64/libexec/git-core/git-shell.exe differ diff --git a/mingw64/libexec/git-core/git-svn b/mingw64/libexec/git-core/git-svn index 74bc50d9e82..82bdc731ffc 100755 --- 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 '; -$VERSION = '2.46.0.windows.1'; +$VERSION = '2.46.1.windows.1'; use Carp qw/croak/; use File::Basename qw/dirname basename/; diff --git a/mingw64/libexec/git-core/git.exe b/mingw64/libexec/git-core/git.exe index 93ded5099d6..a8d49ed25a1 100755 Binary files a/mingw64/libexec/git-core/git.exe and b/mingw64/libexec/git-core/git.exe differ diff --git a/mingw64/libexec/git-core/headless-git.exe b/mingw64/libexec/git-core/headless-git.exe index 8bfea1cdea0..a94a50a1009 100644 Binary files a/mingw64/libexec/git-core/headless-git.exe and b/mingw64/libexec/git-core/headless-git.exe differ diff --git a/mingw64/libexec/git-core/scalar.exe b/mingw64/libexec/git-core/scalar.exe index fb6cb722019..45c1ebb5a57 100644 Binary files a/mingw64/libexec/git-core/scalar.exe and b/mingw64/libexec/git-core/scalar.exe differ diff --git a/mingw64/share/doc/git-doc/DecisionMaking.html b/mingw64/share/doc/git-doc/DecisionMaking.html index df72863c449..2748f185b6c 100644 --- a/mingw64/share/doc/git-doc/DecisionMaking.html +++ b/mingw64/share/doc/git-doc/DecisionMaking.html @@ -541,7 +541,7 @@

Other Discussion Venues

diff --git a/mingw64/share/doc/git-doc/MyFirstContribution.html b/mingw64/share/doc/git-doc/MyFirstContribution.html index 99e8a5e0cdf..087d4379fda 100644 --- a/mingw64/share/doc/git-doc/MyFirstContribution.html +++ b/mingw64/share/doc/git-doc/MyFirstContribution.html @@ -2242,7 +2242,7 @@

After Revie diff --git a/mingw64/share/doc/git-doc/MyFirstObjectWalk.html b/mingw64/share/doc/git-doc/MyFirstObjectWalk.html index ec7c50c7b31..4d2c9d5ebe7 100644 --- a/mingw64/share/doc/git-doc/MyFirstObjectWalk.html +++ b/mingw64/share/doc/git-doc/MyFirstObjectWalk.html @@ -1678,7 +1678,7 @@

Wrapping Up

diff --git a/mingw64/share/doc/git-doc/RelNotes/2.46.1.txt b/mingw64/share/doc/git-doc/RelNotes/2.46.1.txt new file mode 100644 index 00000000000..e55c2c4a468 --- /dev/null +++ b/mingw64/share/doc/git-doc/RelNotes/2.46.1.txt @@ -0,0 +1,75 @@ +Git 2.46.1 Release Notes +======================== + +This release is primarily to merge fixes accumulated on the 'master' +front to prepare for 2.47 release that are still relevant to 2.46.x +maintenance track. + +Fixes since Git 2.46 +-------------------- + + * "git checkout --ours" (no other arguments) complained that the + option is incompatible with branch switching, which is technically + correct, but found confusing by some users. It now says that the + user needs to give pathspec to specify what paths to checkout. + + * It has been documented that we avoid "VAR=VAL shell_func" and why. + + * "git add -p" by users with diff.suppressBlankEmpty set to true + failed to parse the patch that represents an unmodified empty line + with an empty line (not a line with a single space on it), which + has been corrected. + + * "git rebase --help" referred to "offset" (the difference between + the location a change was taken from and the change gets replaced) + incorrectly and called it "fuzz", which has been corrected. + + * "git notes add -m '' --allow-empty" and friends that take prepared + data to create notes should not invoke an editor, but it started + doing so since Git 2.42, which has been corrected. + + * An expensive operation to prepare tracing was done in re-encoding + code path even when the tracing was not requested, which has been + corrected. + + * Perforce tests have been updated. + + * The credential helper to talk to OSX keychain sometimes sent + garbage bytes after the username, which has been corrected. + + * A recent update broke "git ls-remote" used outside a repository, + which has been corrected. + + * "git config --value=foo --fixed-value section.key newvalue" barfed + when the existing value in the configuration file used the + valueless true syntax, which has been corrected. + + * "git reflog expire" failed to honor annotated tags when computing + reachable commits. + + * A flakey test and incorrect calls to strtoX() functions have been + fixed. + + * Follow-up on 2.45.1 regression fix. + + * "git rev-list ... | git diff-tree -p --remerge-diff --stdin" should + behave more or less like "git log -p --remerge-diff" but instead it + crashed, forgetting to prepare a temporary object store needed. + + * The patch parser in "git patch-id" has been tightened to avoid + getting confused by lines that look like a patch header in the log + message. + + * "git bundle unbundle" outside a repository triggered a BUG() + unnecessarily, which has been corrected. + + * The code forgot to discard unnecessary in-core commit buffer data + for commits that "git log --skip=" traversed but omitted + from the output, which has been corrected. + + * "git verify-pack" and "git index-pack" started dying outside a + repository, which has been corrected. + + * A corner case bug in "git stash" was fixed. + +Also contains minor documentation updates and code clean-ups. diff --git a/mingw64/share/doc/git-doc/ReviewingGuidelines.html b/mingw64/share/doc/git-doc/ReviewingGuidelines.html index ad6fbce302e..bf51cc2460d 100644 --- a/mingw64/share/doc/git-doc/ReviewingGuidelines.html +++ b/mingw64/share/doc/git-doc/ReviewingGuidelines.html @@ -666,7 +666,7 @@

See Also

diff --git a/mingw64/share/doc/git-doc/SubmittingPatches.html b/mingw64/share/doc/git-doc/SubmittingPatches.html index 1a8eb154165..6a0735edb5c 100644 --- a/mingw64/share/doc/git-doc/SubmittingPatches.html +++ b/mingw64/share/doc/git-doc/SubmittingPatches.html @@ -1583,7 +1583,7 @@

Gnus

diff --git a/mingw64/share/doc/git-doc/ToolsForGit.html b/mingw64/share/doc/git-doc/ToolsForGit.html index e72e59c2a99..dd977249a77 100644 --- a/mingw64/share/doc/git-doc/ToolsForGit.html +++ b/mingw64/share/doc/git-doc/ToolsForGit.html @@ -523,7 +523,7 @@

-Last updated 2024-07-29 18:18:09 UTC +Last updated 2024-09-18 08:24:21 UTC
diff --git a/mingw64/share/doc/git-doc/everyday.html b/mingw64/share/doc/git-doc/everyday.html index 08aa0591770..a6be39f5041 100644 --- a/mingw64/share/doc/git-doc/everyday.html +++ b/mingw64/share/doc/git-doc/everyday.html @@ -460,7 +460,7 @@

Everyday Git With 20 Commands Or So

diff --git a/mingw64/share/doc/git-doc/git-add.html b/mingw64/share/doc/git-doc/git-add.html index 561f8e1fd2c..30897282c9e 100644 --- a/mingw64/share/doc/git-doc/git-add.html +++ b/mingw64/share/doc/git-doc/git-add.html @@ -1030,7 +1030,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-am.html b/mingw64/share/doc/git-doc/git-am.html index 46ce531751b..ac3412c68a4 100644 --- a/mingw64/share/doc/git-doc/git-am.html +++ b/mingw64/share/doc/git-doc/git-am.html @@ -869,7 +869,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-annotate.html b/mingw64/share/doc/git-doc/git-annotate.html index c491904a507..3cce04bf613 100644 --- a/mingw64/share/doc/git-doc/git-annotate.html +++ b/mingw64/share/doc/git-doc/git-annotate.html @@ -715,7 +715,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-apply.html b/mingw64/share/doc/git-doc/git-apply.html index 676aa02ef26..8bdb17286b5 100644 --- a/mingw64/share/doc/git-doc/git-apply.html +++ b/mingw64/share/doc/git-doc/git-apply.html @@ -836,7 +836,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-archimport.html b/mingw64/share/doc/git-doc/git-archimport.html index 48e5acef9b9..1bbd744aac4 100644 --- a/mingw64/share/doc/git-doc/git-archimport.html +++ b/mingw64/share/doc/git-doc/git-archimport.html @@ -591,7 +591,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-archive.html b/mingw64/share/doc/git-doc/git-archive.html index 9d58a730820..db3733f6d36 100644 --- a/mingw64/share/doc/git-doc/git-archive.html +++ b/mingw64/share/doc/git-doc/git-archive.html @@ -764,7 +764,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-bash.html b/mingw64/share/doc/git-doc/git-bash.html index 78a99c1f736..fe373c9bb1e 100644 --- a/mingw64/share/doc/git-doc/git-bash.html +++ b/mingw64/share/doc/git-doc/git-bash.html @@ -579,7 +579,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-bisect-lk2009.html b/mingw64/share/doc/git-doc/git-bisect-lk2009.html index 485c710f39b..a9b2acbd7f6 100644 --- a/mingw64/share/doc/git-doc/git-bisect-lk2009.html +++ b/mingw64/share/doc/git-doc/git-bisect-lk2009.html @@ -2134,7 +2134,7 @@

References

diff --git a/mingw64/share/doc/git-doc/git-bisect.html b/mingw64/share/doc/git-doc/git-bisect.html index 6ce65243bc8..fa2d259b146 100644 --- a/mingw64/share/doc/git-doc/git-bisect.html +++ b/mingw64/share/doc/git-doc/git-bisect.html @@ -1091,7 +1091,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-blame.html b/mingw64/share/doc/git-doc/git-blame.html index af29a08b878..973fdafb42c 100644 --- a/mingw64/share/doc/git-doc/git-blame.html +++ b/mingw64/share/doc/git-doc/git-blame.html @@ -1097,7 +1097,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-branch.html b/mingw64/share/doc/git-doc/git-branch.html index 8cef8e9ebe8..ca2fa65477b 100644 --- a/mingw64/share/doc/git-doc/git-branch.html +++ b/mingw64/share/doc/git-doc/git-branch.html @@ -1126,7 +1126,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-bugreport.html b/mingw64/share/doc/git-doc/git-bugreport.html index 575dc8c2d53..659e58e3717 100644 --- a/mingw64/share/doc/git-doc/git-bugreport.html +++ b/mingw64/share/doc/git-doc/git-bugreport.html @@ -570,7 +570,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-bundle.html b/mingw64/share/doc/git-doc/git-bundle.html index 5f647f1f12b..a70ccd7824e 100644 --- a/mingw64/share/doc/git-doc/git-bundle.html +++ b/mingw64/share/doc/git-doc/git-bundle.html @@ -862,7 +862,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cat-file.html b/mingw64/share/doc/git-doc/git-cat-file.html index ba39b81dc6c..8baec0aa721 100644 --- a/mingw64/share/doc/git-doc/git-cat-file.html +++ b/mingw64/share/doc/git-doc/git-cat-file.html @@ -821,9 +821,9 @@

BATCH OUTPUT

If --batch or --batch-check is given, cat-file will read objects -from stdin, one per line, and print information about them. By default, -the whole line is considered as an object, as if it were fed to -git-rev-parse(1).

+from stdin, one per line, and print information about them in the same +order as they have been read. By default, the whole line is +considered as an object, as if it were fed to git-rev-parse(1).

When --batch-command is given, cat-file will read commands from stdin, @@ -1014,7 +1014,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cat-file.txt b/mingw64/share/doc/git-doc/git-cat-file.txt index bd95a6c10a7..d5890ae3686 100644 --- a/mingw64/share/doc/git-doc/git-cat-file.txt +++ b/mingw64/share/doc/git-doc/git-cat-file.txt @@ -270,9 +270,9 @@ BATCH OUTPUT ------------ If `--batch` or `--batch-check` is given, `cat-file` will read objects -from stdin, one per line, and print information about them. By default, -the whole line is considered as an object, as if it were fed to -linkgit:git-rev-parse[1]. +from stdin, one per line, and print information about them in the same +order as they have been read. By default, the whole line is +considered as an object, as if it were fed to linkgit:git-rev-parse[1]. When `--batch-command` is given, `cat-file` will read commands from stdin, one per line, and print information based on the command given. With diff --git a/mingw64/share/doc/git-doc/git-check-attr.html b/mingw64/share/doc/git-doc/git-check-attr.html index 42e0eb9c63c..d309eb6faac 100644 --- a/mingw64/share/doc/git-doc/git-check-attr.html +++ b/mingw64/share/doc/git-doc/git-check-attr.html @@ -658,7 +658,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-check-ignore.html b/mingw64/share/doc/git-doc/git-check-ignore.html index 02d0c2677f4..53e78760377 100644 --- a/mingw64/share/doc/git-doc/git-check-ignore.html +++ b/mingw64/share/doc/git-doc/git-check-ignore.html @@ -618,7 +618,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-check-mailmap.html b/mingw64/share/doc/git-doc/git-check-mailmap.html index 418eebce4ce..bbe30d1ffc7 100644 --- a/mingw64/share/doc/git-doc/git-check-mailmap.html +++ b/mingw64/share/doc/git-doc/git-check-mailmap.html @@ -519,7 +519,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-check-ref-format.html b/mingw64/share/doc/git-doc/git-check-ref-format.html index 25babd9b027..a7e561f7775 100644 --- a/mingw64/share/doc/git-doc/git-check-ref-format.html +++ b/mingw64/share/doc/git-doc/git-check-ref-format.html @@ -641,7 +641,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-checkout-index.html b/mingw64/share/doc/git-doc/git-checkout-index.html index 5025836600e..a2cb3a4263d 100644 --- a/mingw64/share/doc/git-doc/git-checkout-index.html +++ b/mingw64/share/doc/git-doc/git-checkout-index.html @@ -693,7 +693,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-checkout.html b/mingw64/share/doc/git-doc/git-checkout.html index 9b9b977a8e7..6652a3fcc0c 100644 --- a/mingw64/share/doc/git-doc/git-checkout.html +++ b/mingw64/share/doc/git-doc/git-checkout.html @@ -1280,7 +1280,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cherry-pick.html b/mingw64/share/doc/git-doc/git-cherry-pick.html index 9e2c611c47d..890133734ae 100644 --- a/mingw64/share/doc/git-doc/git-cherry-pick.html +++ b/mingw64/share/doc/git-doc/git-cherry-pick.html @@ -824,7 +824,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cherry.html b/mingw64/share/doc/git-doc/git-cherry.html index 302dc18f8cd..1e0bcbe8da6 100644 --- a/mingw64/share/doc/git-doc/git-cherry.html +++ b/mingw64/share/doc/git-doc/git-cherry.html @@ -631,7 +631,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-citool.html b/mingw64/share/doc/git-doc/git-citool.html index 9bfcebbebd1..a72ac2d0eb5 100644 --- a/mingw64/share/doc/git-doc/git-citool.html +++ b/mingw64/share/doc/git-doc/git-citool.html @@ -482,7 +482,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-clean.html b/mingw64/share/doc/git-doc/git-clean.html index 0fe23a89aa4..76ad1fd3724 100644 --- a/mingw64/share/doc/git-doc/git-clean.html +++ b/mingw64/share/doc/git-doc/git-clean.html @@ -653,7 +653,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-clone.html b/mingw64/share/doc/git-doc/git-clone.html index 417ea32ac97..57d66cd2f91 100644 --- a/mingw64/share/doc/git-doc/git-clone.html +++ b/mingw64/share/doc/git-doc/git-clone.html @@ -1108,7 +1108,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-column.html b/mingw64/share/doc/git-doc/git-column.html index 36fdcce2961..9d304f725e5 100644 --- a/mingw64/share/doc/git-doc/git-column.html +++ b/mingw64/share/doc/git-doc/git-column.html @@ -669,7 +669,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-commit-graph.html b/mingw64/share/doc/git-doc/git-commit-graph.html index 31bfd6caa5f..7d3bbb5bf73 100644 --- a/mingw64/share/doc/git-doc/git-commit-graph.html +++ b/mingw64/share/doc/git-doc/git-commit-graph.html @@ -717,7 +717,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-commit-tree.html b/mingw64/share/doc/git-doc/git-commit-tree.html index ecf6e7f99f2..3e61c295002 100644 --- a/mingw64/share/doc/git-doc/git-commit-tree.html +++ b/mingw64/share/doc/git-doc/git-commit-tree.html @@ -729,7 +729,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-commit.html b/mingw64/share/doc/git-doc/git-commit.html index 08af6b171c0..d93e8b92709 100644 --- a/mingw64/share/doc/git-doc/git-commit.html +++ b/mingw64/share/doc/git-doc/git-commit.html @@ -453,7 +453,7 @@

SYNOPSIS

git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
-           [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
+           [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]
            [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
            [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
            [--date=<date>] [--cleanup=<mode>] [--[no-]status]
@@ -1394,7 +1394,7 @@ 
GIT
diff --git a/mingw64/share/doc/git-doc/git-commit.txt b/mingw64/share/doc/git-doc/git-commit.txt index 89ecfc63a8d..c822113c111 100644 --- a/mingw64/share/doc/git-doc/git-commit.txt +++ b/mingw64/share/doc/git-doc/git-commit.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git commit' [-a | --interactive | --patch] [-s] [-v] [-u] [--amend] - [--dry-run] [(-c | -C | --squash) | --fixup [(amend|reword):])] + [--dry-run] [(-c | -C | --squash) | --fixup [(amend|reword):]] [-F | -m ] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=] [--date=] [--cleanup=] [--[no-]status] diff --git a/mingw64/share/doc/git-doc/git-config.html b/mingw64/share/doc/git-doc/git-config.html index 47122c2fb67..8f540c46adf 100644 --- a/mingw64/share/doc/git-doc/git-config.html +++ b/mingw64/share/doc/git-doc/git-config.html @@ -453,7 +453,7 @@

SYNOPSIS

git config list [<file-option>] [<display-option>] [--includes]
-git config get [<file-option>] [<display-option>] [--includes] [--all] [--regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] <name>
+git config get [<file-option>] [<display-option>] [--includes] [--all] [--regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>
 git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--fixed-value] <name> <value>
 git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] <name> <value>
 git config rename-section [<file-option>] <old-name> <new-name>
@@ -624,7 +624,7 @@ 
OPTIONS

 

 
With get, return all values for a multi-valued key.

 

-
---regexp

+
--regexp

 

 
With get, interpret the name as a regular expression. Regular
 expression matching is currently case-sensitive and done against a
@@ -856,7 +856,7 @@ 
DEPRECATED MODES

 

 
--get-all <name> [<value-pattern>]

 

-
Replaced by git config get [--value=<pattern>] --all --show-names <name>.

+
Replaced by git config get [--value=<pattern>] --all <name>.

 

 
--get-regexp <name-regexp>

 

@@ -9284,7 +9284,7 @@ 
GIT
diff --git a/mingw64/share/doc/git-doc/git-config.txt b/mingw64/share/doc/git-doc/git-config.txt index 65c645d461a..7f81fbbea83 100644 --- a/mingw64/share/doc/git-doc/git-config.txt +++ b/mingw64/share/doc/git-doc/git-config.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git config list' [] [] [--includes] -'git config get' [] [] [--includes] [--all] [--regexp=] [--value=] [--fixed-value] [--default=] +'git config get' [] [] [--includes] [--all] [--regexp] [--value=] [--fixed-value] [--default=] 'git config set' [] [--type=] [--all] [--value=] [--fixed-value] 'git config unset' [] [--all] [--value=] [--fixed-value] 'git config rename-section' [] @@ -130,7 +130,7 @@ OPTIONS --all:: With `get`, return all values for a multi-valued key. ----regexp:: +--regexp:: With `get`, interpret the name as a regular expression. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names @@ -309,7 +309,7 @@ recommended to migrate to the new syntax. Replaced by `git config get [--value=] `. --get-all []:: - Replaced by `git config get [--value=] --all --show-names `. + Replaced by `git config get [--value=] --all `. --get-regexp :: Replaced by `git config get --all --show-names --regexp `. diff --git a/mingw64/share/doc/git-doc/git-count-objects.html b/mingw64/share/doc/git-doc/git-count-objects.html index 930069962e3..81ff75bf8f8 100644 --- a/mingw64/share/doc/git-doc/git-count-objects.html +++ b/mingw64/share/doc/git-doc/git-count-objects.html @@ -525,7 +525,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-credential-cache--daemon.html b/mingw64/share/doc/git-doc/git-credential-cache--daemon.html index d2f21af3c04..20912d53548 100644 --- a/mingw64/share/doc/git-doc/git-credential-cache--daemon.html +++ b/mingw64/share/doc/git-doc/git-credential-cache--daemon.html @@ -496,7 +496,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-credential-cache.html b/mingw64/share/doc/git-doc/git-credential-cache.html index a6d06e8ad7a..7fd89c93bf4 100644 --- a/mingw64/share/doc/git-doc/git-credential-cache.html +++ b/mingw64/share/doc/git-doc/git-credential-cache.html @@ -556,7 +556,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-credential-store.html b/mingw64/share/doc/git-doc/git-credential-store.html index 65e2e03b675..c091831736e 100644 --- a/mingw64/share/doc/git-doc/git-credential-store.html +++ b/mingw64/share/doc/git-doc/git-credential-store.html @@ -604,7 +604,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-credential.html b/mingw64/share/doc/git-doc/git-credential.html index d1bb906f961..b30c636b38d 100644 --- a/mingw64/share/doc/git-doc/git-credential.html +++ b/mingw64/share/doc/git-doc/git-credential.html @@ -809,7 +809,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cvsexportcommit.html b/mingw64/share/doc/git-doc/git-cvsexportcommit.html index fac4b7cc42e..52286d0e774 100644 --- a/mingw64/share/doc/git-doc/git-cvsexportcommit.html +++ b/mingw64/share/doc/git-doc/git-cvsexportcommit.html @@ -614,7 +614,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cvsimport.html b/mingw64/share/doc/git-doc/git-cvsimport.html index 1ce51e5f245..72d21df52bc 100644 --- a/mingw64/share/doc/git-doc/git-cvsimport.html +++ b/mingw64/share/doc/git-doc/git-cvsimport.html @@ -763,7 +763,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cvsserver.html b/mingw64/share/doc/git-doc/git-cvsserver.html index 7a47496ac49..7e16eaf0bc5 100644 --- a/mingw64/share/doc/git-doc/git-cvsserver.html +++ b/mingw64/share/doc/git-doc/git-cvsserver.html @@ -1040,7 +1040,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-daemon.html b/mingw64/share/doc/git-doc/git-daemon.html index 5715c5ef2be..a992ed5983e 100644 --- a/mingw64/share/doc/git-doc/git-daemon.html +++ b/mingw64/share/doc/git-doc/git-daemon.html @@ -877,7 +877,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-describe.html b/mingw64/share/doc/git-doc/git-describe.html index 9aaa47c7696..24372fdcb0d 100644 --- a/mingw64/share/doc/git-doc/git-describe.html +++ b/mingw64/share/doc/git-doc/git-describe.html @@ -721,7 +721,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-diagnose.html b/mingw64/share/doc/git-doc/git-diagnose.html index fa25b36d72e..5b85e0f10a4 100644 --- a/mingw64/share/doc/git-doc/git-diagnose.html +++ b/mingw64/share/doc/git-doc/git-diagnose.html @@ -548,7 +548,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-diff-files.html b/mingw64/share/doc/git-doc/git-diff-files.html index 62ca6c0b1d2..4cddb9bbe4e 100644 --- a/mingw64/share/doc/git-doc/git-diff-files.html +++ b/mingw64/share/doc/git-doc/git-diff-files.html @@ -2021,7 +2021,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-diff-index.html b/mingw64/share/doc/git-doc/git-diff-index.html index e25315bd1b4..a281ef46b26 100644 --- a/mingw64/share/doc/git-doc/git-diff-index.html +++ b/mingw64/share/doc/git-doc/git-diff-index.html @@ -2152,7 +2152,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-diff-tree.html b/mingw64/share/doc/git-doc/git-diff-tree.html index 029eac91cae..656eb053913 100644 --- a/mingw64/share/doc/git-doc/git-diff-tree.html +++ b/mingw64/share/doc/git-doc/git-diff-tree.html @@ -1576,7 +1576,7 @@

OPTIONS

--no-commit-id

git diff-tree outputs a line with the commit ID when -applicable. This flag suppressed the commit ID output.

+applicable. This flag suppresses the commit ID output.

-c
@@ -2996,7 +2996,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-diff-tree.txt b/mingw64/share/doc/git-doc/git-diff-tree.txt index 143318c411a..09286a85eb2 100644 --- a/mingw64/share/doc/git-doc/git-diff-tree.txt +++ b/mingw64/share/doc/git-doc/git-diff-tree.txt @@ -88,7 +88,7 @@ include::pretty-options.txt[] --no-commit-id:: 'git diff-tree' outputs a line with the commit ID when - applicable. This flag suppressed the commit ID output. + applicable. This flag suppresses the commit ID output. -c:: This flag changes the way a merge commit is displayed diff --git a/mingw64/share/doc/git-doc/git-diff.html b/mingw64/share/doc/git-doc/git-diff.html index b64f5f6e31c..c326f867bf0 100644 --- a/mingw64/share/doc/git-doc/git-diff.html +++ b/mingw64/share/doc/git-doc/git-diff.html @@ -2723,7 +2723,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-difftool.html b/mingw64/share/doc/git-doc/git-difftool.html index bd9b54c58cc..790f9d854a8 100644 --- a/mingw64/share/doc/git-doc/git-difftool.html +++ b/mingw64/share/doc/git-doc/git-difftool.html @@ -692,7 +692,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fast-export.html b/mingw64/share/doc/git-doc/git-fast-export.html index fbfc1a2b0c6..750f014b285 100644 --- a/mingw64/share/doc/git-doc/git-fast-export.html +++ b/mingw64/share/doc/git-doc/git-fast-export.html @@ -798,7 +798,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fast-import.html b/mingw64/share/doc/git-doc/git-fast-import.html index a1af27511ea..a60e0da9be5 100644 --- a/mingw64/share/doc/git-doc/git-fast-import.html +++ b/mingw64/share/doc/git-doc/git-fast-import.html @@ -2547,7 +2547,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fetch-pack.html b/mingw64/share/doc/git-doc/git-fetch-pack.html index e498e08e784..ef09f781522 100644 --- a/mingw64/share/doc/git-doc/git-fetch-pack.html +++ b/mingw64/share/doc/git-doc/git-fetch-pack.html @@ -623,7 +623,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fetch.html b/mingw64/share/doc/git-doc/git-fetch.html index 8f3f9f4fc0f..ad0d6eb5a72 100644 --- a/mingw64/share/doc/git-doc/git-fetch.html +++ b/mingw64/share/doc/git-doc/git-fetch.html @@ -1815,7 +1815,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-filter-branch.html b/mingw64/share/doc/git-doc/git-filter-branch.html index f87fb11b80d..c14d86765ed 100644 --- a/mingw64/share/doc/git-doc/git-filter-branch.html +++ b/mingw64/share/doc/git-doc/git-filter-branch.html @@ -1319,7 +1319,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fmt-merge-msg.html b/mingw64/share/doc/git-doc/git-fmt-merge-msg.html index 4cb3daa40b9..bc74da425d2 100644 --- a/mingw64/share/doc/git-doc/git-fmt-merge-msg.html +++ b/mingw64/share/doc/git-doc/git-fmt-merge-msg.html @@ -590,7 +590,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-for-each-ref.html b/mingw64/share/doc/git-doc/git-for-each-ref.html index 76782250733..29dbe9b2daa 100644 --- a/mingw64/share/doc/git-doc/git-for-each-ref.html +++ b/mingw64/share/doc/git-doc/git-for-each-ref.html @@ -1089,7 +1089,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-for-each-repo.html b/mingw64/share/doc/git-doc/git-for-each-repo.html index 49203c65a4c..f083878c749 100644 --- a/mingw64/share/doc/git-doc/git-for-each-repo.html +++ b/mingw64/share/doc/git-doc/git-for-each-repo.html @@ -539,7 +539,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-format-patch.html b/mingw64/share/doc/git-doc/git-format-patch.html index 3f70e494170..4184e9eef46 100644 --- a/mingw64/share/doc/git-doc/git-format-patch.html +++ b/mingw64/share/doc/git-doc/git-format-patch.html @@ -1987,7 +1987,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fsck-objects.html b/mingw64/share/doc/git-doc/git-fsck-objects.html index cb5beca3974..69de08f499d 100644 --- a/mingw64/share/doc/git-doc/git-fsck-objects.html +++ b/mingw64/share/doc/git-doc/git-fsck-objects.html @@ -476,7 +476,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fsck.html b/mingw64/share/doc/git-doc/git-fsck.html index 65e5d5caf9f..09ca7ab3780 100644 --- a/mingw64/share/doc/git-doc/git-fsck.html +++ b/mingw64/share/doc/git-doc/git-fsck.html @@ -1021,7 +1021,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fsmonitor--daemon.html b/mingw64/share/doc/git-doc/git-fsmonitor--daemon.html index 495fcee85e1..5bb0cf6df0e 100644 --- a/mingw64/share/doc/git-doc/git-fsmonitor--daemon.html +++ b/mingw64/share/doc/git-doc/git-fsmonitor--daemon.html @@ -606,7 +606,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-gc.html b/mingw64/share/doc/git-doc/git-gc.html index e31715bed14..c0b4a6814b2 100644 --- a/mingw64/share/doc/git-doc/git-gc.html +++ b/mingw64/share/doc/git-doc/git-gc.html @@ -887,7 +887,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-get-tar-commit-id.html b/mingw64/share/doc/git-doc/git-get-tar-commit-id.html index 905a585a912..6e9d5959a3c 100644 --- a/mingw64/share/doc/git-doc/git-get-tar-commit-id.html +++ b/mingw64/share/doc/git-doc/git-get-tar-commit-id.html @@ -484,7 +484,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-grep.html b/mingw64/share/doc/git-doc/git-grep.html index 74ec4660012..aa2240d3941 100644 --- a/mingw64/share/doc/git-doc/git-grep.html +++ b/mingw64/share/doc/git-doc/git-grep.html @@ -932,7 +932,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-gui.html b/mingw64/share/doc/git-doc/git-gui.html index a507ecc6f5b..d19d7943b55 100644 --- a/mingw64/share/doc/git-doc/git-gui.html +++ b/mingw64/share/doc/git-doc/git-gui.html @@ -612,7 +612,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-hash-object.html b/mingw64/share/doc/git-doc/git-hash-object.html index 047d4af4ee3..ecb3d406f75 100644 --- a/mingw64/share/doc/git-doc/git-hash-object.html +++ b/mingw64/share/doc/git-doc/git-hash-object.html @@ -533,7 +533,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-help.html b/mingw64/share/doc/git-doc/git-help.html index 7bfbf31708c..359e35dcb43 100644 --- a/mingw64/share/doc/git-doc/git-help.html +++ b/mingw64/share/doc/git-doc/git-help.html @@ -753,7 +753,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-hook.html b/mingw64/share/doc/git-doc/git-hook.html index 1a60d9690fe..a7b0696945d 100644 --- a/mingw64/share/doc/git-doc/git-hook.html +++ b/mingw64/share/doc/git-doc/git-hook.html @@ -524,7 +524,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-http-backend.html b/mingw64/share/doc/git-doc/git-http-backend.html index b61cb1d67ef..a49c1c7a25a 100644 --- a/mingw64/share/doc/git-doc/git-http-backend.html +++ b/mingw64/share/doc/git-doc/git-http-backend.html @@ -830,7 +830,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-http-fetch.html b/mingw64/share/doc/git-doc/git-http-fetch.html index 3078ace8ecc..831e9ddfde9 100644 --- a/mingw64/share/doc/git-doc/git-http-fetch.html +++ b/mingw64/share/doc/git-doc/git-http-fetch.html @@ -537,7 +537,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-http-push.html b/mingw64/share/doc/git-doc/git-http-push.html index 5efae27a5b3..979ad2e876d 100644 --- a/mingw64/share/doc/git-doc/git-http-push.html +++ b/mingw64/share/doc/git-doc/git-http-push.html @@ -592,7 +592,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-imap-send.html b/mingw64/share/doc/git-doc/git-imap-send.html index 92ff23576a1..fd11f6d3565 100644 --- a/mingw64/share/doc/git-doc/git-imap-send.html +++ b/mingw64/share/doc/git-doc/git-imap-send.html @@ -723,7 +723,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-index-pack.html b/mingw64/share/doc/git-doc/git-index-pack.html index 092f6bf3eb8..fa079ede1ca 100644 --- a/mingw64/share/doc/git-doc/git-index-pack.html +++ b/mingw64/share/doc/git-doc/git-index-pack.html @@ -651,7 +651,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-init-db.html b/mingw64/share/doc/git-doc/git-init-db.html index fd1f7e3f4ec..43b1ca6b345 100644 --- a/mingw64/share/doc/git-doc/git-init-db.html +++ b/mingw64/share/doc/git-doc/git-init-db.html @@ -476,7 +476,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-init.html b/mingw64/share/doc/git-doc/git-init.html index e4cd3f15253..d51dc4b5ec9 100644 --- a/mingw64/share/doc/git-doc/git-init.html +++ b/mingw64/share/doc/git-doc/git-init.html @@ -735,7 +735,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-instaweb.html b/mingw64/share/doc/git-doc/git-instaweb.html index fd90ac0c265..784b7c788cf 100644 --- a/mingw64/share/doc/git-doc/git-instaweb.html +++ b/mingw64/share/doc/git-doc/git-instaweb.html @@ -572,7 +572,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-interpret-trailers.html b/mingw64/share/doc/git-doc/git-interpret-trailers.html index 51dc25a0804..859075f76d9 100644 --- a/mingw64/share/doc/git-doc/git-interpret-trailers.html +++ b/mingw64/share/doc/git-doc/git-interpret-trailers.html @@ -1080,7 +1080,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-log.html b/mingw64/share/doc/git-doc/git-log.html index 2c2ac54f25d..236414af2ca 100644 --- a/mingw64/share/doc/git-doc/git-log.html +++ b/mingw64/share/doc/git-doc/git-log.html @@ -4409,7 +4409,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-ls-files.html b/mingw64/share/doc/git-doc/git-ls-files.html index f5e1dd9b1a7..45e1eac9480 100644 --- a/mingw64/share/doc/git-doc/git-ls-files.html +++ b/mingw64/share/doc/git-doc/git-ls-files.html @@ -734,9 +734,9 @@

OPTIONS

--format=<format>

A string that interpolates %(fieldname) from the result being shown. -It also interpolates %% to %, and %xx where xx are hex digits -interpolates to character with hex code xx; for example %00 -interpolates to \0 (NUL), %09 to \t (TAB) and %0a to \n (LF). +It also interpolates %% to %, and %xXX where XX are hex digits +interpolates to character with hex code XX; for example %x00 +interpolates to \0 (NUL), %x09 to \t (TAB) and %x0a to \n (LF). --format cannot be combined with -s, -o, -k, -t, --resolve-undo and --eol.

@@ -934,7 +934,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-ls-files.txt b/mingw64/share/doc/git-doc/git-ls-files.txt index d08c7da8f49..58c529afbee 100644 --- a/mingw64/share/doc/git-doc/git-ls-files.txt +++ b/mingw64/share/doc/git-doc/git-ls-files.txt @@ -219,9 +219,9 @@ followed by the ("attr/"). --format=:: A string that interpolates `%(fieldname)` from the result being shown. - It also interpolates `%%` to `%`, and `%xx` where `xx` are hex digits - interpolates to character with hex code `xx`; for example `%00` - interpolates to `\0` (NUL), `%09` to `\t` (TAB) and %0a to `\n` (LF). + It also interpolates `%%` to `%`, and `%xXX` where `XX` are hex digits + interpolates to character with hex code `XX`; for example `%x00` + interpolates to `\0` (NUL), `%x09` to `\t` (TAB) and %x0a to `\n` (LF). --format cannot be combined with `-s`, `-o`, `-k`, `-t`, `--resolve-undo` and `--eol`. \--:: diff --git a/mingw64/share/doc/git-doc/git-ls-remote.html b/mingw64/share/doc/git-doc/git-ls-remote.html index a954435cd34..8603d39cdc9 100644 --- a/mingw64/share/doc/git-doc/git-ls-remote.html +++ b/mingw64/share/doc/git-doc/git-ls-remote.html @@ -647,7 +647,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-ls-tree.html b/mingw64/share/doc/git-doc/git-ls-tree.html index a9453c1f7f4..4070d60234f 100644 --- a/mingw64/share/doc/git-doc/git-ls-tree.html +++ b/mingw64/share/doc/git-doc/git-ls-tree.html @@ -681,7 +681,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mailinfo.html b/mingw64/share/doc/git-doc/git-mailinfo.html index b36f40b33e1..21d56fad859 100644 --- a/mingw64/share/doc/git-doc/git-mailinfo.html +++ b/mingw64/share/doc/git-doc/git-mailinfo.html @@ -640,7 +640,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mailsplit.html b/mingw64/share/doc/git-doc/git-mailsplit.html index 2f547da4c6f..8f518242bc5 100644 --- a/mingw64/share/doc/git-doc/git-mailsplit.html +++ b/mingw64/share/doc/git-doc/git-mailsplit.html @@ -538,7 +538,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-maintenance.html b/mingw64/share/doc/git-doc/git-maintenance.html index f5a04f70429..288751301c4 100644 --- a/mingw64/share/doc/git-doc/git-maintenance.html +++ b/mingw64/share/doc/git-doc/git-maintenance.html @@ -1044,7 +1044,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge-base.html b/mingw64/share/doc/git-doc/git-merge-base.html index 505bf116ca0..10552c4529b 100644 --- a/mingw64/share/doc/git-doc/git-merge-base.html +++ b/mingw64/share/doc/git-doc/git-merge-base.html @@ -763,7 +763,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge-file.html b/mingw64/share/doc/git-doc/git-merge-file.html index efdf77fc918..4767555151b 100644 --- a/mingw64/share/doc/git-doc/git-merge-file.html +++ b/mingw64/share/doc/git-doc/git-merge-file.html @@ -604,7 +604,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge-index.html b/mingw64/share/doc/git-doc/git-merge-index.html index e47c726a6f5..d9c76acb28a 100644 --- a/mingw64/share/doc/git-doc/git-merge-index.html +++ b/mingw64/share/doc/git-doc/git-merge-index.html @@ -558,7 +558,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge-one-file.html b/mingw64/share/doc/git-doc/git-merge-one-file.html index b9f2a3336fd..28dcf316e73 100644 --- a/mingw64/share/doc/git-doc/git-merge-one-file.html +++ b/mingw64/share/doc/git-doc/git-merge-one-file.html @@ -476,7 +476,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge-tree.html b/mingw64/share/doc/git-doc/git-merge-tree.html index ff03e4843bc..7d31ecfeff7 100644 --- a/mingw64/share/doc/git-doc/git-merge-tree.html +++ b/mingw64/share/doc/git-doc/git-merge-tree.html @@ -903,7 +903,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge.html b/mingw64/share/doc/git-doc/git-merge.html index 0e03fc96736..8106f144cb1 100644 --- a/mingw64/share/doc/git-doc/git-merge.html +++ b/mingw64/share/doc/git-doc/git-merge.html @@ -1701,7 +1701,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mergetool--lib.html b/mingw64/share/doc/git-doc/git-mergetool--lib.html index 21e68afa890..1e3248f6312 100644 --- a/mingw64/share/doc/git-doc/git-mergetool--lib.html +++ b/mingw64/share/doc/git-doc/git-mergetool--lib.html @@ -522,7 +522,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mergetool.html b/mingw64/share/doc/git-doc/git-mergetool.html index b97ea27f43b..06cdd727e2d 100644 --- a/mingw64/share/doc/git-doc/git-mergetool.html +++ b/mingw64/share/doc/git-doc/git-mergetool.html @@ -1018,7 +1018,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mktag.html b/mingw64/share/doc/git-doc/git-mktag.html index c2a4bd05078..3b991a3a5b7 100644 --- a/mingw64/share/doc/git-doc/git-mktag.html +++ b/mingw64/share/doc/git-doc/git-mktag.html @@ -545,7 +545,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mktree.html b/mingw64/share/doc/git-doc/git-mktree.html index dd5e6dcd515..80a90c5f798 100644 --- a/mingw64/share/doc/git-doc/git-mktree.html +++ b/mingw64/share/doc/git-doc/git-mktree.html @@ -505,7 +505,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-multi-pack-index.html b/mingw64/share/doc/git-doc/git-multi-pack-index.html index 0e56541b9c6..445d69ba41a 100644 --- a/mingw64/share/doc/git-doc/git-multi-pack-index.html +++ b/mingw64/share/doc/git-doc/git-multi-pack-index.html @@ -639,7 +639,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mv.html b/mingw64/share/doc/git-doc/git-mv.html index 31d03908715..2d755472c98 100644 --- a/mingw64/share/doc/git-doc/git-mv.html +++ b/mingw64/share/doc/git-doc/git-mv.html @@ -550,7 +550,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-name-rev.html b/mingw64/share/doc/git-doc/git-name-rev.html index c7cc47f7e82..3dcb1815901 100644 --- a/mingw64/share/doc/git-doc/git-name-rev.html +++ b/mingw64/share/doc/git-doc/git-name-rev.html @@ -590,7 +590,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-notes.html b/mingw64/share/doc/git-doc/git-notes.html index 0d6799a2d49..60e5fb61cd2 100644 --- a/mingw64/share/doc/git-doc/git-notes.html +++ b/mingw64/share/doc/git-doc/git-notes.html @@ -1010,7 +1010,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-p4.html b/mingw64/share/doc/git-doc/git-p4.html index c82338352ff..d59d493f076 100644 --- a/mingw64/share/doc/git-doc/git-p4.html +++ b/mingw64/share/doc/git-doc/git-p4.html @@ -1514,7 +1514,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-pack-objects.html b/mingw64/share/doc/git-doc/git-pack-objects.html index 469c4fdef56..4b11a9a40af 100644 --- a/mingw64/share/doc/git-doc/git-pack-objects.html +++ b/mingw64/share/doc/git-doc/git-pack-objects.html @@ -994,7 +994,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-pack-redundant.html b/mingw64/share/doc/git-doc/git-pack-redundant.html index 3567cc6ef8e..f14ceb9bd2f 100644 --- a/mingw64/share/doc/git-doc/git-pack-redundant.html +++ b/mingw64/share/doc/git-doc/git-pack-redundant.html @@ -538,7 +538,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-pack-refs.html b/mingw64/share/doc/git-doc/git-pack-refs.html index f159a345e93..10e5e6ce776 100644 --- a/mingw64/share/doc/git-doc/git-pack-refs.html +++ b/mingw64/share/doc/git-doc/git-pack-refs.html @@ -581,7 +581,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-patch-id.html b/mingw64/share/doc/git-doc/git-patch-id.html index e247fcf3c74..a09170ef67b 100644 --- a/mingw64/share/doc/git-doc/git-patch-id.html +++ b/mingw64/share/doc/git-doc/git-patch-id.html @@ -554,7 +554,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-prune-packed.html b/mingw64/share/doc/git-doc/git-prune-packed.html index 34e634a7e2c..e213e1967dc 100644 --- a/mingw64/share/doc/git-doc/git-prune-packed.html +++ b/mingw64/share/doc/git-doc/git-prune-packed.html @@ -516,7 +516,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-prune.html b/mingw64/share/doc/git-doc/git-prune.html index e822f6e471e..a0bb2f33b37 100644 --- a/mingw64/share/doc/git-doc/git-prune.html +++ b/mingw64/share/doc/git-doc/git-prune.html @@ -577,7 +577,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-pull.html b/mingw64/share/doc/git-doc/git-pull.html index 3780197966d..7aa257d9f38 100644 --- a/mingw64/share/doc/git-doc/git-pull.html +++ b/mingw64/share/doc/git-doc/git-pull.html @@ -1870,7 +1870,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-push.html b/mingw64/share/doc/git-doc/git-push.html index 130955df4fa..0abdfd1db4c 100644 --- a/mingw64/share/doc/git-doc/git-push.html +++ b/mingw64/share/doc/git-doc/git-push.html @@ -1814,7 +1814,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-quiltimport.html b/mingw64/share/doc/git-doc/git-quiltimport.html index 036dd6e282f..47c63f9ef69 100644 --- a/mingw64/share/doc/git-doc/git-quiltimport.html +++ b/mingw64/share/doc/git-doc/git-quiltimport.html @@ -533,7 +533,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-range-diff.html b/mingw64/share/doc/git-doc/git-range-diff.html index 87d6161700d..e97c3f58a7d 100644 --- a/mingw64/share/doc/git-doc/git-range-diff.html +++ b/mingw64/share/doc/git-doc/git-range-diff.html @@ -814,7 +814,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-read-tree.html b/mingw64/share/doc/git-doc/git-read-tree.html index 16949381d4c..3fccd5df3e5 100644 --- a/mingw64/share/doc/git-doc/git-read-tree.html +++ b/mingw64/share/doc/git-doc/git-read-tree.html @@ -997,7 +997,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rebase.html b/mingw64/share/doc/git-doc/git-rebase.html index cd05bb3bf88..c7e637bd80a 100644 --- a/mingw64/share/doc/git-doc/git-rebase.html +++ b/mingw64/share/doc/git-doc/git-rebase.html @@ -1436,7 +1436,7 @@

Context

format-patch internally), and then applying the patches in sequence (calling am internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The -line numbers have to be taken with some fuzz, since the other side +line numbers have to be taken with some offset, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple @@ -2484,7 +2484,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rebase.txt b/mingw64/share/doc/git-doc/git-rebase.txt index 74df345f9e8..b18cdbc0239 100644 --- a/mingw64/share/doc/git-doc/git-rebase.txt +++ b/mingw64/share/doc/git-doc/git-rebase.txt @@ -737,7 +737,7 @@ The 'apply' backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The -line numbers have to be taken with some fuzz, since the other side +line numbers have to be taken with some offset, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple diff --git a/mingw64/share/doc/git-doc/git-receive-pack.html b/mingw64/share/doc/git-doc/git-receive-pack.html index 1fbdf25364a..c34d9c21d45 100644 --- a/mingw64/share/doc/git-doc/git-receive-pack.html +++ b/mingw64/share/doc/git-doc/git-receive-pack.html @@ -809,7 +809,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-reflog.html b/mingw64/share/doc/git-doc/git-reflog.html index 626d4b414cd..6a8b5247fb8 100644 --- a/mingw64/share/doc/git-doc/git-reflog.html +++ b/mingw64/share/doc/git-doc/git-reflog.html @@ -615,7 +615,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-refs.html b/mingw64/share/doc/git-doc/git-refs.html index 2c6e7f0caa2..c3912e3a77f 100644 --- a/mingw64/share/doc/git-doc/git-refs.html +++ b/mingw64/share/doc/git-doc/git-refs.html @@ -551,7 +551,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-remote-ext.html b/mingw64/share/doc/git-doc/git-remote-ext.html index 83c23c7a289..82db479e7dd 100644 --- a/mingw64/share/doc/git-doc/git-remote-ext.html +++ b/mingw64/share/doc/git-doc/git-remote-ext.html @@ -627,7 +627,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-remote-fd.html b/mingw64/share/doc/git-doc/git-remote-fd.html index 274fe4b63c0..f7daf264daf 100644 --- a/mingw64/share/doc/git-doc/git-remote-fd.html +++ b/mingw64/share/doc/git-doc/git-remote-fd.html @@ -542,7 +542,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-remote-helpers.html b/mingw64/share/doc/git-doc/git-remote-helpers.html index 7bc5d55fbd8..fb5a51ff959 100644 --- a/mingw64/share/doc/git-doc/git-remote-helpers.html +++ b/mingw64/share/doc/git-doc/git-remote-helpers.html @@ -460,7 +460,7 @@

git-remote-helpers

diff --git a/mingw64/share/doc/git-doc/git-remote.html b/mingw64/share/doc/git-doc/git-remote.html index 8f3fc3dd77a..62e777cfdbc 100644 --- a/mingw64/share/doc/git-doc/git-remote.html +++ b/mingw64/share/doc/git-doc/git-remote.html @@ -777,7 +777,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-repack.html b/mingw64/share/doc/git-doc/git-repack.html index 91e0d213e38..1e6c8b2f43e 100644 --- a/mingw64/share/doc/git-doc/git-repack.html +++ b/mingw64/share/doc/git-doc/git-repack.html @@ -783,7 +783,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-replace.html b/mingw64/share/doc/git-doc/git-replace.html index e8e70800d75..ed183086be4 100644 --- a/mingw64/share/doc/git-doc/git-replace.html +++ b/mingw64/share/doc/git-doc/git-replace.html @@ -669,7 +669,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-replay.html b/mingw64/share/doc/git-doc/git-replay.html index 9dd7171389e..935c6d3a430 100644 --- a/mingw64/share/doc/git-doc/git-replay.html +++ b/mingw64/share/doc/git-doc/git-replay.html @@ -1911,7 +1911,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-request-pull.html b/mingw64/share/doc/git-doc/git-request-pull.html index 18917558f05..6f70ad78720 100644 --- a/mingw64/share/doc/git-doc/git-request-pull.html +++ b/mingw64/share/doc/git-doc/git-request-pull.html @@ -563,7 +563,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rerere.html b/mingw64/share/doc/git-doc/git-rerere.html index 02c4bbbf2f5..655f4f6bb44 100644 --- a/mingw64/share/doc/git-doc/git-rerere.html +++ b/mingw64/share/doc/git-doc/git-rerere.html @@ -713,7 +713,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-reset.html b/mingw64/share/doc/git-doc/git-reset.html index 9bd793eca56..86d96ef742f 100644 --- a/mingw64/share/doc/git-doc/git-reset.html +++ b/mingw64/share/doc/git-doc/git-reset.html @@ -1158,7 +1158,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-restore.html b/mingw64/share/doc/git-doc/git-restore.html index 0749995f861..ed6c7d8094d 100644 --- a/mingw64/share/doc/git-doc/git-restore.html +++ b/mingw64/share/doc/git-doc/git-restore.html @@ -738,7 +738,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rev-list.html b/mingw64/share/doc/git-doc/git-rev-list.html index 314ce7a3180..681fb944d8f 100644 --- a/mingw64/share/doc/git-doc/git-rev-list.html +++ b/mingw64/share/doc/git-doc/git-rev-list.html @@ -2960,7 +2960,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rev-parse.html b/mingw64/share/doc/git-doc/git-rev-parse.html index 959cbf212f1..ceb1f57e036 100644 --- a/mingw64/share/doc/git-doc/git-rev-parse.html +++ b/mingw64/share/doc/git-doc/git-rev-parse.html @@ -1661,7 +1661,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-revert.html b/mingw64/share/doc/git-doc/git-revert.html index 3d073dfea06..2ad3999d11b 100644 --- a/mingw64/share/doc/git-doc/git-revert.html +++ b/mingw64/share/doc/git-doc/git-revert.html @@ -706,7 +706,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rm.html b/mingw64/share/doc/git-doc/git-rm.html index c6f2d8a0ed8..3c16502c061 100644 --- a/mingw64/share/doc/git-doc/git-rm.html +++ b/mingw64/share/doc/git-doc/git-rm.html @@ -720,7 +720,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-send-email.html b/mingw64/share/doc/git-doc/git-send-email.html index 9b6c129ba24..e19050f74b2 100644 --- a/mingw64/share/doc/git-doc/git-send-email.html +++ b/mingw64/share/doc/git-doc/git-send-email.html @@ -1290,7 +1290,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-send-pack.html b/mingw64/share/doc/git-doc/git-send-pack.html index 7c7f6d1e9be..972a712bafb 100644 --- a/mingw64/share/doc/git-doc/git-send-pack.html +++ b/mingw64/share/doc/git-doc/git-send-pack.html @@ -656,7 +656,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-sh-i18n--envsubst.html b/mingw64/share/doc/git-doc/git-sh-i18n--envsubst.html index 43de600db7b..e07da87bf69 100644 --- a/mingw64/share/doc/git-doc/git-sh-i18n--envsubst.html +++ b/mingw64/share/doc/git-doc/git-sh-i18n--envsubst.html @@ -493,7 +493,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-sh-i18n.html b/mingw64/share/doc/git-doc/git-sh-i18n.html index a29ac6c7eee..749e7fef4c1 100644 --- a/mingw64/share/doc/git-doc/git-sh-i18n.html +++ b/mingw64/share/doc/git-doc/git-sh-i18n.html @@ -507,7 +507,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-sh-setup.html b/mingw64/share/doc/git-doc/git-sh-setup.html index b86434882e4..239e0bfc920 100644 --- a/mingw64/share/doc/git-doc/git-sh-setup.html +++ b/mingw64/share/doc/git-doc/git-sh-setup.html @@ -571,7 +571,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-shell.html b/mingw64/share/doc/git-doc/git-shell.html index 04e0db47e71..f4961fc021f 100644 --- a/mingw64/share/doc/git-doc/git-shell.html +++ b/mingw64/share/doc/git-doc/git-shell.html @@ -587,7 +587,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-shortlog.html b/mingw64/share/doc/git-doc/git-shortlog.html index ec9a507e478..3994325b0f8 100644 --- a/mingw64/share/doc/git-doc/git-shortlog.html +++ b/mingw64/share/doc/git-doc/git-shortlog.html @@ -1564,7 +1564,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-show-branch.html b/mingw64/share/doc/git-doc/git-show-branch.html index 265079a30be..ae35a30a6e9 100644 --- a/mingw64/share/doc/git-doc/git-show-branch.html +++ b/mingw64/share/doc/git-doc/git-show-branch.html @@ -716,7 +716,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-show-index.html b/mingw64/share/doc/git-doc/git-show-index.html index 40fea6bd37c..144e5827d49 100644 --- a/mingw64/share/doc/git-doc/git-show-index.html +++ b/mingw64/share/doc/git-doc/git-show-index.html @@ -532,7 +532,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-show-ref.html b/mingw64/share/doc/git-doc/git-show-ref.html index 080be676b18..af32739edcd 100644 --- a/mingw64/share/doc/git-doc/git-show-ref.html +++ b/mingw64/share/doc/git-doc/git-show-ref.html @@ -712,7 +712,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-show.html b/mingw64/share/doc/git-doc/git-show.html index dacbab64c0a..0df0504a9aa 100644 --- a/mingw64/share/doc/git-doc/git-show.html +++ b/mingw64/share/doc/git-doc/git-show.html @@ -2818,7 +2818,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-sparse-checkout.html b/mingw64/share/doc/git-doc/git-sparse-checkout.html index fa4bfb620ec..5fe093a35a3 100644 --- a/mingw64/share/doc/git-doc/git-sparse-checkout.html +++ b/mingw64/share/doc/git-doc/git-sparse-checkout.html @@ -1045,7 +1045,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-stage.html b/mingw64/share/doc/git-doc/git-stage.html index 05470ac0626..d60db255bc2 100644 --- a/mingw64/share/doc/git-doc/git-stage.html +++ b/mingw64/share/doc/git-doc/git-stage.html @@ -476,7 +476,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-stash.html b/mingw64/share/doc/git-doc/git-stash.html index e694038d97e..f10f920b7f7 100644 --- a/mingw64/share/doc/git-doc/git-stash.html +++ b/mingw64/share/doc/git-doc/git-stash.html @@ -959,7 +959,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-status.html b/mingw64/share/doc/git-doc/git-status.html index d5aa444f366..c3378296724 100644 --- a/mingw64/share/doc/git-doc/git-status.html +++ b/mingw64/share/doc/git-doc/git-status.html @@ -1160,7 +1160,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-stripspace.html b/mingw64/share/doc/git-doc/git-stripspace.html index 4800cfcbcda..37843103c6a 100644 --- a/mingw64/share/doc/git-doc/git-stripspace.html +++ b/mingw64/share/doc/git-doc/git-stripspace.html @@ -579,7 +579,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-submodule.html b/mingw64/share/doc/git-doc/git-submodule.html index 035b73eddec..9d40f246e47 100644 --- a/mingw64/share/doc/git-doc/git-submodule.html +++ b/mingw64/share/doc/git-doc/git-submodule.html @@ -1032,7 +1032,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-subtree.html b/mingw64/share/doc/git-doc/git-subtree.html index 56e59b59486..699a3605246 100644 --- a/mingw64/share/doc/git-doc/git-subtree.html +++ b/mingw64/share/doc/git-doc/git-subtree.html @@ -941,7 +941,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-svn.html b/mingw64/share/doc/git-doc/git-svn.html index a9411a0ee7f..7cca9d96e84 100644 --- a/mingw64/share/doc/git-doc/git-svn.html +++ b/mingw64/share/doc/git-doc/git-svn.html @@ -1978,7 +1978,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-switch.html b/mingw64/share/doc/git-doc/git-switch.html index fe678ff006b..d43c87b0d6a 100644 --- a/mingw64/share/doc/git-doc/git-switch.html +++ b/mingw64/share/doc/git-doc/git-switch.html @@ -865,7 +865,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-symbolic-ref.html b/mingw64/share/doc/git-doc/git-symbolic-ref.html index 5ea81259534..a90e2ff9978 100644 --- a/mingw64/share/doc/git-doc/git-symbolic-ref.html +++ b/mingw64/share/doc/git-doc/git-symbolic-ref.html @@ -553,7 +553,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-tag.html b/mingw64/share/doc/git-doc/git-tag.html index 598ece883f9..ec464808109 100644 --- a/mingw64/share/doc/git-doc/git-tag.html +++ b/mingw64/share/doc/git-doc/git-tag.html @@ -1015,7 +1015,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-tools.html b/mingw64/share/doc/git-doc/git-tools.html index d44b2d0b830..fb2fe3e1d40 100644 --- a/mingw64/share/doc/git-doc/git-tools.html +++ b/mingw64/share/doc/git-doc/git-tools.html @@ -460,7 +460,7 @@

Git Tools

diff --git a/mingw64/share/doc/git-doc/git-unpack-file.html b/mingw64/share/doc/git-doc/git-unpack-file.html index f79d03e8aaf..e44674b56e2 100644 --- a/mingw64/share/doc/git-doc/git-unpack-file.html +++ b/mingw64/share/doc/git-doc/git-unpack-file.html @@ -490,7 +490,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-unpack-objects.html b/mingw64/share/doc/git-doc/git-unpack-objects.html index 60f7f608f13..15cae07364e 100644 --- a/mingw64/share/doc/git-doc/git-unpack-objects.html +++ b/mingw64/share/doc/git-doc/git-unpack-objects.html @@ -520,7 +520,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-update-index.html b/mingw64/share/doc/git-doc/git-update-index.html index 95ec7517dc7..2ba51229698 100644 --- a/mingw64/share/doc/git-doc/git-update-index.html +++ b/mingw64/share/doc/git-doc/git-update-index.html @@ -1227,7 +1227,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-update-ref.html b/mingw64/share/doc/git-doc/git-update-ref.html index 75325c185db..a6b38dd1868 100644 --- a/mingw64/share/doc/git-doc/git-update-ref.html +++ b/mingw64/share/doc/git-doc/git-update-ref.html @@ -723,7 +723,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-update-server-info.html b/mingw64/share/doc/git-doc/git-update-server-info.html index 172220f76d1..b445d5e6d6a 100644 --- a/mingw64/share/doc/git-doc/git-update-server-info.html +++ b/mingw64/share/doc/git-doc/git-update-server-info.html @@ -513,7 +513,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-upload-archive.html b/mingw64/share/doc/git-doc/git-upload-archive.html index 99b25164a27..98bb4901eb8 100644 --- a/mingw64/share/doc/git-doc/git-upload-archive.html +++ b/mingw64/share/doc/git-doc/git-upload-archive.html @@ -538,7 +538,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-upload-pack.html b/mingw64/share/doc/git-doc/git-upload-pack.html index 530c81dd444..c85663b9fb7 100644 --- a/mingw64/share/doc/git-doc/git-upload-pack.html +++ b/mingw64/share/doc/git-doc/git-upload-pack.html @@ -582,7 +582,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-var.html b/mingw64/share/doc/git-doc/git-var.html index 162bd900023..b7127b44e3f 100644 --- a/mingw64/share/doc/git-doc/git-var.html +++ b/mingw64/share/doc/git-doc/git-var.html @@ -591,7 +591,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-verify-commit.html b/mingw64/share/doc/git-doc/git-verify-commit.html index 06eb4064082..2dd7b1d3d1f 100644 --- a/mingw64/share/doc/git-doc/git-verify-commit.html +++ b/mingw64/share/doc/git-doc/git-verify-commit.html @@ -498,7 +498,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-verify-pack.html b/mingw64/share/doc/git-doc/git-verify-pack.html index 04822f91a86..852f3043fcf 100644 --- a/mingw64/share/doc/git-doc/git-verify-pack.html +++ b/mingw64/share/doc/git-doc/git-verify-pack.html @@ -530,7 +530,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-verify-tag.html b/mingw64/share/doc/git-doc/git-verify-tag.html index a3689edf63c..3c67c4972f7 100644 --- a/mingw64/share/doc/git-doc/git-verify-tag.html +++ b/mingw64/share/doc/git-doc/git-verify-tag.html @@ -498,7 +498,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-version.html b/mingw64/share/doc/git-doc/git-version.html index d1471ffb2c9..58ee8f433f0 100644 --- a/mingw64/share/doc/git-doc/git-version.html +++ b/mingw64/share/doc/git-doc/git-version.html @@ -493,7 +493,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-web--browse.html b/mingw64/share/doc/git-doc/git-web--browse.html index f0fef7fc98b..cd67cb9f0f4 100644 --- a/mingw64/share/doc/git-doc/git-web--browse.html +++ b/mingw64/share/doc/git-doc/git-web--browse.html @@ -642,7 +642,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-whatchanged.html b/mingw64/share/doc/git-doc/git-whatchanged.html index 630b86cf1e2..9101a1bab50 100644 --- a/mingw64/share/doc/git-doc/git-whatchanged.html +++ b/mingw64/share/doc/git-doc/git-whatchanged.html @@ -505,7 +505,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-worktree.html b/mingw64/share/doc/git-doc/git-worktree.html index 1ebbac91698..1a09f7dd9ce 100644 --- a/mingw64/share/doc/git-doc/git-worktree.html +++ b/mingw64/share/doc/git-doc/git-worktree.html @@ -1087,7 +1087,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-write-tree.html b/mingw64/share/doc/git-doc/git-write-tree.html index 9d20f7d828e..a5b01089fd5 100644 --- a/mingw64/share/doc/git-doc/git-write-tree.html +++ b/mingw64/share/doc/git-doc/git-write-tree.html @@ -507,7 +507,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git.html b/mingw64/share/doc/git-doc/git.html index cca4abf0e74..5e553cdea08 100644 --- a/mingw64/share/doc/git-doc/git.html +++ b/mingw64/share/doc/git-doc/git.html @@ -2678,7 +2678,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitattributes.html b/mingw64/share/doc/git-doc/gitattributes.html index eaf12946e6f..91b3ac83b4d 100644 --- a/mingw64/share/doc/git-doc/gitattributes.html +++ b/mingw64/share/doc/git-doc/gitattributes.html @@ -2161,7 +2161,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcli.html b/mingw64/share/doc/git-doc/gitcli.html index 27a8fe6b119..d87bc46857b 100644 --- a/mingw64/share/doc/git-doc/gitcli.html +++ b/mingw64/share/doc/git-doc/gitcli.html @@ -761,7 +761,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcore-tutorial.html b/mingw64/share/doc/git-doc/gitcore-tutorial.html index e0f37ff3568..550adf63db0 100644 --- a/mingw64/share/doc/git-doc/gitcore-tutorial.html +++ b/mingw64/share/doc/git-doc/gitcore-tutorial.html @@ -2633,7 +2633,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcredentials.html b/mingw64/share/doc/git-doc/gitcredentials.html index b7be23e8fe0..c68f9d61df9 100644 --- a/mingw64/share/doc/git-doc/gitcredentials.html +++ b/mingw64/share/doc/git-doc/gitcredentials.html @@ -859,7 +859,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcvs-migration.html b/mingw64/share/doc/git-doc/gitcvs-migration.html index 29523a759d9..1184522d411 100644 --- a/mingw64/share/doc/git-doc/gitcvs-migration.html +++ b/mingw64/share/doc/git-doc/gitcvs-migration.html @@ -728,7 +728,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitdiffcore.html b/mingw64/share/doc/git-doc/gitdiffcore.html index 78ef20cfc09..2dcf95a584c 100644 --- a/mingw64/share/doc/git-doc/gitdiffcore.html +++ b/mingw64/share/doc/git-doc/gitdiffcore.html @@ -867,7 +867,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/giteveryday.html b/mingw64/share/doc/git-doc/giteveryday.html index 5ba6b0350b3..95b71ef2c42 100644 --- a/mingw64/share/doc/git-doc/giteveryday.html +++ b/mingw64/share/doc/git-doc/giteveryday.html @@ -1139,7 +1139,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitfaq.html b/mingw64/share/doc/git-doc/gitfaq.html index 0d20f3f4f8e..ba5481adf83 100644 --- a/mingw64/share/doc/git-doc/gitfaq.html +++ b/mingw64/share/doc/git-doc/gitfaq.html @@ -1161,7 +1161,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-bundle.html b/mingw64/share/doc/git-doc/gitformat-bundle.html index 7da5c79c06a..2766a73ec67 100644 --- a/mingw64/share/doc/git-doc/gitformat-bundle.html +++ b/mingw64/share/doc/git-doc/gitformat-bundle.html @@ -593,7 +593,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-chunk.html b/mingw64/share/doc/git-doc/gitformat-chunk.html index 3757cdcbce2..7c349588f5d 100644 --- a/mingw64/share/doc/git-doc/gitformat-chunk.html +++ b/mingw64/share/doc/git-doc/gitformat-chunk.html @@ -626,7 +626,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-commit-graph.html b/mingw64/share/doc/git-doc/gitformat-commit-graph.html index 82b4982e828..defae476a91 100644 --- a/mingw64/share/doc/git-doc/gitformat-commit-graph.html +++ b/mingw64/share/doc/git-doc/gitformat-commit-graph.html @@ -774,7 +774,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-index.html b/mingw64/share/doc/git-doc/gitformat-index.html index 1c62fa902fa..169dd41f7df 100644 --- a/mingw64/share/doc/git-doc/gitformat-index.html +++ b/mingw64/share/doc/git-doc/gitformat-index.html @@ -1193,7 +1193,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-pack.html b/mingw64/share/doc/git-doc/gitformat-pack.html index 97ea67dcc5e..5da6880331d 100644 --- a/mingw64/share/doc/git-doc/gitformat-pack.html +++ b/mingw64/share/doc/git-doc/gitformat-pack.html @@ -1462,7 +1462,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-signature.html b/mingw64/share/doc/git-doc/gitformat-signature.html index 5a275c01f92..f6650733931 100644 --- a/mingw64/share/doc/git-doc/gitformat-signature.html +++ b/mingw64/share/doc/git-doc/gitformat-signature.html @@ -756,7 +756,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitglossary.html b/mingw64/share/doc/git-doc/gitglossary.html index c84cbaafdcb..10f0f02fe4d 100644 --- a/mingw64/share/doc/git-doc/gitglossary.html +++ b/mingw64/share/doc/git-doc/gitglossary.html @@ -1413,7 +1413,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/githooks.html b/mingw64/share/doc/git-doc/githooks.html index 987d6c2d1a6..d021aef5b8b 100644 --- a/mingw64/share/doc/git-doc/githooks.html +++ b/mingw64/share/doc/git-doc/githooks.html @@ -951,14 +951,14 @@

post-receive

This hook is invoked by git-receive-pack(1) when it reacts to git push and updates reference(s) in its repository. -It executes on the remote repository once after all the refs have -been updated.

+The hook executes on the remote repository once after all the proposed +ref updates are processed and if at least one ref is updated as the +result.

-

This hook executes once for the receive operation. It takes no -arguments, but gets the same information as the -pre-receive -hook does on its standard input.

+

The hook takes no arguments. It receives one line on standard input for +each ref that is successfully updated following the same format as the +pre-receive hook.

This hook does not affect the outcome of git receive-pack, as it @@ -990,6 +990,10 @@

post-receive

to use push options, but doesn’t transmit any, the count variable will be set to zero, GIT_PUSH_OPTION_COUNT=0.

+
+

See the "post-receive" section in git-receive-pack(1) for +additional details.

+

post-update

@@ -1396,7 +1400,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/githooks.txt b/mingw64/share/doc/git-doc/githooks.txt index 06e997131bc..0397dec64d7 100644 --- a/mingw64/share/doc/git-doc/githooks.txt +++ b/mingw64/share/doc/git-doc/githooks.txt @@ -415,13 +415,13 @@ post-receive This hook is invoked by linkgit:git-receive-pack[1] when it reacts to `git push` and updates reference(s) in its repository. -It executes on the remote repository once after all the refs have -been updated. +The hook executes on the remote repository once after all the proposed +ref updates are processed and if at least one ref is updated as the +result. -This hook executes once for the receive operation. It takes no -arguments, but gets the same information as the -<> -hook does on its standard input. +The hook takes no arguments. It receives one line on standard input for +each ref that is successfully updated following the same format as the +<> hook. This hook does not affect the outcome of `git receive-pack`, as it is called after the real work is done. @@ -448,6 +448,9 @@ environment variables will not be set. If the client selects to use push options, but doesn't transmit any, the count variable will be set to zero, `GIT_PUSH_OPTION_COUNT=0`. +See the "post-receive" section in linkgit:git-receive-pack[1] for +additional details. + [[post-update]] post-update ~~~~~~~~~~~ diff --git a/mingw64/share/doc/git-doc/gitignore.html b/mingw64/share/doc/git-doc/gitignore.html index fd2335996ad..5baa7104b71 100644 --- a/mingw64/share/doc/git-doc/gitignore.html +++ b/mingw64/share/doc/git-doc/gitignore.html @@ -769,7 +769,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitk.html b/mingw64/share/doc/git-doc/gitk.html index 4d98118c3d6..db27678ceac 100644 --- a/mingw64/share/doc/git-doc/gitk.html +++ b/mingw64/share/doc/git-doc/gitk.html @@ -748,7 +748,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitmailmap.html b/mingw64/share/doc/git-doc/gitmailmap.html index 40ad2dad1b1..eb1a3767a92 100644 --- a/mingw64/share/doc/git-doc/gitmailmap.html +++ b/mingw64/share/doc/git-doc/gitmailmap.html @@ -642,7 +642,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitmodules.html b/mingw64/share/doc/git-doc/gitmodules.html index 14181f6a57c..eafeb1c0807 100644 --- a/mingw64/share/doc/git-doc/gitmodules.html +++ b/mingw64/share/doc/git-doc/gitmodules.html @@ -635,7 +635,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitnamespaces.html b/mingw64/share/doc/git-doc/gitnamespaces.html index 96eea3d1162..039355e23fc 100644 --- a/mingw64/share/doc/git-doc/gitnamespaces.html +++ b/mingw64/share/doc/git-doc/gitnamespaces.html @@ -569,7 +569,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitpacking.html b/mingw64/share/doc/git-doc/gitpacking.html index a2756acf95f..c0be0237c9c 100644 --- a/mingw64/share/doc/git-doc/gitpacking.html +++ b/mingw64/share/doc/git-doc/gitpacking.html @@ -821,7 +821,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-capabilities.html b/mingw64/share/doc/git-doc/gitprotocol-capabilities.html index a42305a3d99..973938b0093 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-capabilities.html +++ b/mingw64/share/doc/git-doc/gitprotocol-capabilities.html @@ -976,7 +976,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-common.html b/mingw64/share/doc/git-doc/gitprotocol-common.html index 5f9d8dafe90..d8635d99203 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-common.html +++ b/mingw64/share/doc/git-doc/gitprotocol-common.html @@ -605,7 +605,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-http.html b/mingw64/share/doc/git-doc/gitprotocol-http.html index 87bf0f47917..7a71c20aa73 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-http.html +++ b/mingw64/share/doc/git-doc/gitprotocol-http.html @@ -1204,7 +1204,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-pack.html b/mingw64/share/doc/git-doc/gitprotocol-pack.html index 70da9bd1d95..8f13617e603 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-pack.html +++ b/mingw64/share/doc/git-doc/gitprotocol-pack.html @@ -1358,7 +1358,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-v2.html b/mingw64/share/doc/git-doc/gitprotocol-v2.html index fa4c414e95f..0aaddd23e92 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-v2.html +++ b/mingw64/share/doc/git-doc/gitprotocol-v2.html @@ -1526,7 +1526,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitremote-helpers.html b/mingw64/share/doc/git-doc/gitremote-helpers.html index c6dd011d781..8236e1242c4 100644 --- a/mingw64/share/doc/git-doc/gitremote-helpers.html +++ b/mingw64/share/doc/git-doc/gitremote-helpers.html @@ -1172,7 +1172,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitrepository-layout.html b/mingw64/share/doc/git-doc/gitrepository-layout.html index 12b70aaf6dd..4abdf6a1c22 100644 --- a/mingw64/share/doc/git-doc/gitrepository-layout.html +++ b/mingw64/share/doc/git-doc/gitrepository-layout.html @@ -975,7 +975,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitrevisions.html b/mingw64/share/doc/git-doc/gitrevisions.html index 59651399124..368fcf32a57 100644 --- a/mingw64/share/doc/git-doc/gitrevisions.html +++ b/mingw64/share/doc/git-doc/gitrevisions.html @@ -1037,7 +1037,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitsubmodules.html b/mingw64/share/doc/git-doc/gitsubmodules.html index 428bfc82d1e..4ea75d3377b 100644 --- a/mingw64/share/doc/git-doc/gitsubmodules.html +++ b/mingw64/share/doc/git-doc/gitsubmodules.html @@ -867,7 +867,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gittutorial-2.html b/mingw64/share/doc/git-doc/gittutorial-2.html index 943c76d622a..18ad7ae7f2a 100644 --- a/mingw64/share/doc/git-doc/gittutorial-2.html +++ b/mingw64/share/doc/git-doc/gittutorial-2.html @@ -978,7 +978,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gittutorial.html b/mingw64/share/doc/git-doc/gittutorial.html index 4321d330218..a408d39dd62 100644 --- a/mingw64/share/doc/git-doc/gittutorial.html +++ b/mingw64/share/doc/git-doc/gittutorial.html @@ -904,7 +904,7 @@

Using Git for collaboration

exclude anything that is reachable from both of them".

-

Please note that these range notation can be used with both gitk +

Please note that these range notations can be used with both gitk and git log.

@@ -1315,7 +1315,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gittutorial.txt b/mingw64/share/doc/git-doc/gittutorial.txt index 47594087880..f89ad30cf65 100644 --- a/mingw64/share/doc/git-doc/gittutorial.txt +++ b/mingw64/share/doc/git-doc/gittutorial.txt @@ -360,7 +360,7 @@ $ gitk HEAD...FETCH_HEAD This means "show everything that is reachable from either one, but exclude anything that is reachable from both of them". -Please note that these range notation can be used with both `gitk` +Please note that these range notations can be used with both `gitk` and `git log`. After inspecting what Bob did, if there is nothing urgent, Alice may diff --git a/mingw64/share/doc/git-doc/gitweb.conf.html b/mingw64/share/doc/git-doc/gitweb.conf.html index 6784b9464d2..82e8c14afbe 100644 --- a/mingw64/share/doc/git-doc/gitweb.conf.html +++ b/mingw64/share/doc/git-doc/gitweb.conf.html @@ -1696,7 +1696,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitweb.html b/mingw64/share/doc/git-doc/gitweb.html index a2e399c42dd..09aa5e86961 100644 --- a/mingw64/share/doc/git-doc/gitweb.html +++ b/mingw64/share/doc/git-doc/gitweb.html @@ -1379,7 +1379,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitworkflows.html b/mingw64/share/doc/git-doc/gitworkflows.html index 9e4d4d916c3..dcb17138d90 100644 --- a/mingw64/share/doc/git-doc/gitworkflows.html +++ b/mingw64/share/doc/git-doc/gitworkflows.html @@ -1067,7 +1067,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/howto-index.html b/mingw64/share/doc/git-doc/howto-index.html index 2f85cfe05e1..4ae6aa47ee7 100644 --- a/mingw64/share/doc/git-doc/howto-index.html +++ b/mingw64/share/doc/git-doc/howto-index.html @@ -625,7 +625,7 @@

Git Howto Index

diff --git a/mingw64/share/doc/git-doc/howto/coordinate-embargoed-releases.html b/mingw64/share/doc/git-doc/howto/coordinate-embargoed-releases.html index b119d6ed1d4..fc0bbf5008c 100644 --- a/mingw64/share/doc/git-doc/howto/coordinate-embargoed-releases.html +++ b/mingw64/share/doc/git-doc/howto/coordinate-embargoed-releases.html @@ -736,7 +736,7 @@

Example mail to diff --git a/mingw64/share/doc/git-doc/howto/keep-canonical-history-correct.html b/mingw64/share/doc/git-doc/howto/keep-canonical-history-correct.html index fdb02ef11d7..6980eaa6c27 100644 --- a/mingw64/share/doc/git-doc/howto/keep-canonical-history-correct.html +++ b/mingw64/share/doc/git-doc/howto/keep-canonical-history-correct.html @@ -706,7 +706,7 @@

Keep authoritative canonical history correct with git pull

diff --git a/mingw64/share/doc/git-doc/howto/maintain-git.html b/mingw64/share/doc/git-doc/howto/maintain-git.html index 6b0124192d6..59315fb703d 100644 --- a/mingw64/share/doc/git-doc/howto/maintain-git.html +++ b/mingw64/share/doc/git-doc/howto/maintain-git.html @@ -494,7 +494,7 @@

The Policy

The policy on Integration is informally mentioned in "A Note from the maintainer" message, which is periodically posted to -this mailing list after each feature release is made.

+the mailing list after each feature release is made:

    @@ -504,18 +504,15 @@

    The Policy

    functionality, performance and usability, without regression.

  • -

    One release cycle for a feature release is expected to last for -eight to ten weeks.

    -
    • -
  • -

    Maintenance releases are numbered as vX.Y.Z and are meant +

    Maintenance releases are numbered as vX.Y.Z (0 < Z) and are meant to contain only bugfixes for the corresponding vX.Y.0 feature release and earlier maintenance releases vX.Y.W (W < Z).

  • -

    master branch is used to prepare for the next feature +

    The master branch is used to prepare for the next feature release. In other words, at some point, the tip of master -branch is tagged with vX.Y.0.

    +branch is tagged as vX.(Y+1).0, when vX.Y.0 is the latest +feature release.

  • maint branch is used to prepare for the next maintenance @@ -528,12 +525,14 @@

    The Policy

    next branch is used to publish changes (both enhancements and fixes) that (1) have worthwhile goal, (2) are in a fairly good shape suitable for everyday use, (3) but have not yet -demonstrated to be regression free. New changes are tested -in next before merged to master.

    +demonstrated to be regression free. Reviews from contributors on +the mailing list help to make the determination. After a topic +is merged to next, it is tested for at least 7 calendar days +before getting merged to master.

  • seen branch is used to publish other proposed changes that do -not yet pass the criteria set for next.

    +not yet pass the criteria set for next (see above).

  • The tips of master and maint branches will not be rewound to @@ -556,6 +555,42 @@

    The Policy

    users are encouraged to test it so that regressions and bugs are found before new topics are merged to master.

    • +
  • +

    When a problem is found in a topic in next, the topic is marked +not to be merged to master. Follow-up patches are discussed on +the mailing list and applied to the topic after being reviewed and +then the topic is merged (again) to next. After going through +the usual testing in next, the entire (fixed) topic is merged +to master.

    +
    • +
  • +

    One release cycle for a feature release is expected to last for +eight to ten weeks. A few "release candidate" releases are +expected to be tagged about a week apart before the final +release, and a "preview" release is tagged about a week before +the first release candidate gets tagged.

    +
    • +
  • +

    After the preview release is tagged, topics that were well +reviewed may be merged to master before spending the usual 7 +calendar days in next, with the expectation that any bugs in +them can be caught and fixed in the release candidates before +the final release.

    +
    • +
  • +

    After the first release candidate is tagged, the contributors are +strongly encouraged to focus on finding and fixing new regressions +introduced during the cycle, over addressing old bugs and any new +features. Topics stop getting merged down from next to master, +and new topics stop getting merged to next. Unless they are fixes +to new regressions in the cycle, that is.

    +
    • +
  • +

    Soon after a feature release is made, the tip of maint gets +fast-forwarded to point at the release. Topics that have been +kept in next are merged down to master and a new development +cycle starts.

    +
@@ -651,6 +686,13 @@

A Typical Git Day

$ make test ;# final review
+
+
+
If the tip of 'master' is updated, also generate the preformatted
+documentation and push the out result to git-htmldocs and
+git-manpages repositories.
+
+

  • Handle the remaining patches:

    @@ -693,7 +735,7 @@

    A Typical Git Day

    $ git checkout ai/topic ;# or "git checkout -b ai/topic master"
-$ git am -sc3 mailbox
    +$ git am -sc3 --whitespace=warn mailbox
    @@ -704,7 +746,7 @@

    A Typical Git Day

    $ git checkout master...ai/topic ;# try to reapply to the same base
-$ git am -sc3 mailbox
    +$ git am -sc3 --whitespace=warn mailbox
    @@ -746,39 +788,49 @@

    A Typical Git Day

    These changes are what the maintainer is not 100% committed to (trivial typofixes etc. are often squashed directly into the patches that need fixing, without being applied as a separate -"SQUASH???" commit), so that they can be removed easily as needed. +"SQUASH???" commit), so that they can be removed easily as needed. +The expectation is that the original author will make corrections +in a reroll.
  • -

    Merge maint to master as needed:

    -
    -
    -
    $ git checkout master
-$ git merge maint
-$ make test
    -
    -
    +

    By now, new topic branches are created and existing topic +branches are updated. The integration branches next, jch, +and seen need to be updated to contain them.

    +
    • +
  • +

    If there are topics that have been merged to master and should +be merged to maint, merge them to maint, and update the +release notes to the next maintenance release.

    +
    • +
  • +

    Review the latest issue of "What’s cooking" again. Are topics +that have been sufficiently long in next ready to be merged to +master? Are topics we saw earlier and are in seen now got +positive reviews and are ready to be merged to next?

    +
    • +
  • +

    If there are topics that have been cooking in next long enough +and should be merged to master, merge them to master, and +update the release notes to the next feature release.

  • -

    Merge master to next as needed:

    +

    If there were patches directly made on maint, merge maint to +master; make sure that the result is what you want.

    -
    $ git checkout next
-$ git merge master
+
    $ git checkout master
+$ git merge -m "Sync with 'maint'" --no-log maint
+$ git log -p --first-parent ORIG_HEAD..
 $ make test
  • -

    Review the last issue of "What’s cooking" again and see if topics -that are ready to be merged to next are still in good shape -(e.g. has there any new issue identified on the list with the -series?)

    -
    • -
  • -

    Prepare jch branch, which is used to represent somewhere -between master and seen and often is slightly ahead of next.

    +

    Prepare to update the jch branch, which is used to represent +somewhere between master and seen and often is slightly ahead +of next, and the seen branch, which is used to hold the rest.

    $ Meta/Reintegrate master..jch >Meta/redo-jch.sh
    @@ -787,17 +839,29 @@

    A Typical Git Day

    The result is a script that lists topics to be merged in order to
-rebuild 'seen' as the input to Meta/Reintegrate script.  Remove
-later topics that should not be in 'jch' yet.  Add a line that
-consists of '### match next' before the name of the first topic
-in the output that should be in 'jch' but not in 'next' yet.
    +rebuild the current 'jch'. Do the same for 'seen'.
  • -

    Now we are ready to start merging topics to next. For each -branch whose tip is not merged to next, one of three things can -happen:

    +

    Review the Meta/redo-jch.sh and Meta/redo-seen.sh scripts. The +former should have a line # match next---the idea is that +merging the topics listed before the line on top of master +should result in a tree identical to that of next.

    +
    • +
  • +

    As newly created topics are usually merged near the tip of +seen, add them to the end of the Meta/redo-seen.sh script. +Among the topics that were in seen, there may be ones that +are not quite ready for next but are getting there. Move +them from Meta/redo-seen.sh to the end of Meta/redo-jch.sh. +The expectation is that you’d use jch as your daily driver +as the first guinea pig, so you should choose carefully.

    +
    • +
  • +

    Now we are ready to start rebuilding jch and merging topics to +next. For each branch whose tip is not merged to next, one +of three things can happen:

  • The commits are all next-worthy; merge the topic to next;

    @@ -814,13 +878,18 @@

    A Typical Git Day

    If a topic that was already in 'next' gained a patch, the script would list it as "ai/topic~1". To include the new patch to the updated 'next', drop the "~1" part; to keep it excluded, do not -touch the line. If a topic that was not in 'next' should be -merged to 'next', add it at the end of the list. Then: +touch the line.
    -
    $ git checkout -B jch master
+
    If a topic that was not in 'next' should be merged to 'next', add
+it before the '### match next' line.  Then:
    
+
    +
    +
    +
    +
    $ git checkout --detach master
 $ sh Meta/redo-jch.sh -c1
    @@ -838,12 +907,12 @@

    A Typical Git Day

    reference to the variable under its old name), in which case prepare an appropriate merge-fix first (see appendix), and rebuild the 'jch' branch from scratch, starting at the tip of -'master'. +'master', this time without using "-c1" to merge all topics.
    -
    Then do the same to 'next'
    +
    Then do the same to 'next'.
    @@ -856,26 +925,32 @@

    A Typical Git Day

    The "-e" option allows the merge message that comes from the
 history of the topic and the comments in the "What's cooking" to
-be edited.  The resulting tree should match 'jch' as the same set
-of topics are merged on 'master'; otherwise there is a mismerge.
-Investigate why and do not proceed until the mismerge is found
-and rectified.
    +be edited. The resulting tree should match 'jch^{/^### match next'}' +as the same set of topics are merged on 'master'; otherwise there +is a mismerge. Investigate why and do not proceed until the mismerge +is found and rectified.
    -
    $ git diff jch next
    +
    If 'master' was updated before you started redoing 'next', then
    -
    Then build the rest of 'jch':
    +
    $ git diff 'jch^{/^### match next}' next
    -
    $ git checkout jch
-$ sh Meta/redo-jch.sh
    +
    would show differences that went into 'master' (which 'jch' has,
+but 'next' does not yet---often it is updates to the release
+notes).  Merge 'master' back to 'next' if that is the case.
    +
    +
    +
    +
    +
    $ git merge -m "Sync with 'master'" --no-log master
    @@ -897,18 +972,7 @@

    A Typical Git Day

  • -

    Rebuild seen.

    -
    -
    -
    $ Meta/Reintegrate jch..seen >Meta/redo-seen.sh
    -
    -
    -
    -
    -
    Edit the result by adding new topics that are not still in 'seen'
-in the script.  Then
    -
    -
    +

    Rebuild seen on top of jch.

    $ git checkout -B seen jch
@@ -932,7 +996,7 @@ 
    A Typical Git Day
    -
    $ git branch --no-merged seen
    +
    $ git branch --no-merged seen '??/*'
    @@ -1179,7 +1243,7 @@

    Preparing a "merge-fix"

    diff --git a/mingw64/share/doc/git-doc/howto/maintain-git.txt b/mingw64/share/doc/git-doc/howto/maintain-git.txt index 013014bbef6..da31332f113 100644 --- a/mingw64/share/doc/git-doc/howto/maintain-git.txt +++ b/mingw64/share/doc/git-doc/howto/maintain-git.txt @@ -37,22 +37,20 @@ The Policy The policy on Integration is informally mentioned in "A Note from the maintainer" message, which is periodically posted to -this mailing list after each feature release is made. +the mailing list after each feature release is made: - Feature releases are numbered as vX.Y.0 and are meant to contain bugfixes and enhancements in any area, including functionality, performance and usability, without regression. - - One release cycle for a feature release is expected to last for - eight to ten weeks. - - - Maintenance releases are numbered as vX.Y.Z and are meant + - Maintenance releases are numbered as vX.Y.Z (0 < Z) and are meant to contain only bugfixes for the corresponding vX.Y.0 feature release and earlier maintenance releases vX.Y.W (W < Z). - - 'master' branch is used to prepare for the next feature + - The 'master' branch is used to prepare for the next feature release. In other words, at some point, the tip of 'master' - branch is tagged with vX.Y.0. + branch is tagged as vX.(Y+1).0, when vX.Y.0 is the latest + feature release. - 'maint' branch is used to prepare for the next maintenance release. After the feature release vX.Y.0 is made, the tip @@ -63,11 +61,13 @@ this mailing list after each feature release is made. - 'next' branch is used to publish changes (both enhancements and fixes) that (1) have worthwhile goal, (2) are in a fairly good shape suitable for everyday use, (3) but have not yet - demonstrated to be regression free. New changes are tested - in 'next' before merged to 'master'. + demonstrated to be regression free. Reviews from contributors on + the mailing list help to make the determination. After a topic + is merged to 'next', it is tested for at least 7 calendar days + before getting merged to 'master'. - 'seen' branch is used to publish other proposed changes that do - not yet pass the criteria set for 'next'. + not yet pass the criteria set for 'next' (see above). - The tips of 'master' and 'maint' branches will not be rewound to allow people to build their own customization on top of them. @@ -86,6 +86,38 @@ this mailing list after each feature release is made. users are encouraged to test it so that regressions and bugs are found before new topics are merged to 'master'. + - When a problem is found in a topic in 'next', the topic is marked + not to be merged to 'master'. Follow-up patches are discussed on + the mailing list and applied to the topic after being reviewed and + then the topic is merged (again) to 'next'. After going through + the usual testing in 'next', the entire (fixed) topic is merged + to 'master'. + + - One release cycle for a feature release is expected to last for + eight to ten weeks. A few "release candidate" releases are + expected to be tagged about a week apart before the final + release, and a "preview" release is tagged about a week before + the first release candidate gets tagged. + + - After the preview release is tagged, topics that were well + reviewed may be merged to 'master' before spending the usual 7 + calendar days in 'next', with the expectation that any bugs in + them can be caught and fixed in the release candidates before + the final release. + + - After the first release candidate is tagged, the contributors are + strongly encouraged to focus on finding and fixing new regressions + introduced during the cycle, over addressing old bugs and any new + features. Topics stop getting merged down from 'next' to 'master', + and new topics stop getting merged to 'next'. Unless they are fixes + to new regressions in the cycle, that is. + + - Soon after a feature release is made, the tip of 'maint' gets + fast-forwarded to point at the release. Topics that have been + kept in 'next' are merged down to 'master' and a new development + cycle starts. + + Note that before v1.9.0 release, the version numbers used to be structured slightly differently. vX.Y.Z were feature releases while vX.Y.Z.W were maintenance releases for vX.Y.Z. @@ -149,6 +181,10 @@ by doing the following: $ git diff ORIG_HEAD.. ;# final review $ make test ;# final review + If the tip of 'master' is updated, also generate the preformatted + documentation and push the out result to git-htmldocs and + git-manpages repositories. + - Handle the remaining patches: - Anything unobvious that is applicable to 'master' (in other @@ -179,12 +215,12 @@ by doing the following: The initial round is done with: $ git checkout ai/topic ;# or "git checkout -b ai/topic master" - $ git am -sc3 mailbox + $ git am -sc3 --whitespace=warn mailbox and replacing an existing topic with subsequent round is done with: $ git checkout master...ai/topic ;# try to reapply to the same base - $ git am -sc3 mailbox + $ git am -sc3 --whitespace=warn mailbox to prepare the new round on a detached HEAD, and then @@ -209,39 +245,59 @@ by doing the following: (trivial typofixes etc. are often squashed directly into the patches that need fixing, without being applied as a separate "SQUASH???" commit), so that they can be removed easily as needed. + The expectation is that the original author will make corrections + in a reroll. + - By now, new topic branches are created and existing topic + branches are updated. The integration branches 'next', 'jch', + and 'seen' need to be updated to contain them. - - Merge maint to master as needed: + - If there are topics that have been merged to 'master' and should + be merged to 'maint', merge them to 'maint', and update the + release notes to the next maintenance release. - $ git checkout master - $ git merge maint - $ make test + - Review the latest issue of "What's cooking" again. Are topics + that have been sufficiently long in 'next' ready to be merged to + 'master'? Are topics we saw earlier and are in 'seen' now got + positive reviews and are ready to be merged to 'next'? - - Merge master to next as needed: + - If there are topics that have been cooking in 'next' long enough + and should be merged to 'master', merge them to 'master', and + update the release notes to the next feature release. - $ git checkout next - $ git merge master - $ make test + - If there were patches directly made on 'maint', merge 'maint' to + 'master'; make sure that the result is what you want. - - Review the last issue of "What's cooking" again and see if topics - that are ready to be merged to 'next' are still in good shape - (e.g. has there any new issue identified on the list with the - series?) + $ git checkout master + $ git merge -m "Sync with 'maint'" --no-log maint + $ git log -p --first-parent ORIG_HEAD.. + $ make test - - Prepare 'jch' branch, which is used to represent somewhere - between 'master' and 'seen' and often is slightly ahead of 'next'. + - Prepare to update the 'jch' branch, which is used to represent + somewhere between 'master' and 'seen' and often is slightly ahead + of 'next', and the 'seen' branch, which is used to hold the rest. $ Meta/Reintegrate master..jch >Meta/redo-jch.sh The result is a script that lists topics to be merged in order to - rebuild 'seen' as the input to Meta/Reintegrate script. Remove - later topics that should not be in 'jch' yet. Add a line that - consists of '### match next' before the name of the first topic - in the output that should be in 'jch' but not in 'next' yet. + rebuild the current 'jch'. Do the same for 'seen'. + + - Review the Meta/redo-jch.sh and Meta/redo-seen.sh scripts. The + former should have a line '### match next'---the idea is that + merging the topics listed before the line on top of 'master' + should result in a tree identical to that of 'next'. - - Now we are ready to start merging topics to 'next'. For each - branch whose tip is not merged to 'next', one of three things can - happen: + - As newly created topics are usually merged near the tip of + 'seen', add them to the end of the Meta/redo-seen.sh script. + Among the topics that were in 'seen', there may be ones that + are not quite ready for 'next' but are getting there. Move + them from Meta/redo-seen.sh to the end of Meta/redo-jch.sh. + The expectation is that you'd use 'jch' as your daily driver + as the first guinea pig, so you should choose carefully. + + - Now we are ready to start rebuilding 'jch' and merging topics to + 'next'. For each branch whose tip is not merged to 'next', one + of three things can happen: - The commits are all next-worthy; merge the topic to next; - The new parts are of mixed quality, but earlier ones are @@ -252,10 +308,12 @@ by doing the following: If a topic that was already in 'next' gained a patch, the script would list it as "ai/topic~1". To include the new patch to the updated 'next', drop the "~1" part; to keep it excluded, do not - touch the line. If a topic that was not in 'next' should be - merged to 'next', add it at the end of the list. Then: + touch the line. + + If a topic that was not in 'next' should be merged to 'next', add + it before the '### match next' line. Then: - $ git checkout -B jch master + $ git checkout --detach master $ sh Meta/redo-jch.sh -c1 to rebuild the 'jch' branch from scratch. "-c1" tells the script @@ -267,26 +325,29 @@ by doing the following: reference to the variable under its old name), in which case prepare an appropriate merge-fix first (see appendix), and rebuild the 'jch' branch from scratch, starting at the tip of - 'master'. + 'master', this time without using "-c1" to merge all topics. - Then do the same to 'next' + Then do the same to 'next'. $ git checkout next $ sh Meta/redo-jch.sh -c1 -e The "-e" option allows the merge message that comes from the history of the topic and the comments in the "What's cooking" to - be edited. The resulting tree should match 'jch' as the same set - of topics are merged on 'master'; otherwise there is a mismerge. - Investigate why and do not proceed until the mismerge is found - and rectified. + be edited. The resulting tree should match 'jch^{/^### match next'}' + as the same set of topics are merged on 'master'; otherwise there + is a mismerge. Investigate why and do not proceed until the mismerge + is found and rectified. + + If 'master' was updated before you started redoing 'next', then - $ git diff jch next + $ git diff 'jch^{/^### match next}' next - Then build the rest of 'jch': + would show differences that went into 'master' (which 'jch' has, + but 'next' does not yet---often it is updates to the release + notes). Merge 'master' back to 'next' if that is the case. - $ git checkout jch - $ sh Meta/redo-jch.sh + $ git merge -m "Sync with 'master'" --no-log master When all is well, clean up the redo-jch.sh script with @@ -296,12 +357,7 @@ by doing the following: merged to 'master'. This may lose '### match next' marker; add it again to the appropriate place when it happens. - - Rebuild 'seen'. - - $ Meta/Reintegrate jch..seen >Meta/redo-seen.sh - - Edit the result by adding new topics that are not still in 'seen' - in the script. Then + - Rebuild 'seen' on top of 'jch'. $ git checkout -B seen jch $ sh Meta/redo-seen.sh @@ -312,7 +368,7 @@ by doing the following: Double check by running - $ git branch --no-merged seen + $ git branch --no-merged seen '??/*' to see there is no unexpected leftover topics. diff --git a/mingw64/share/doc/git-doc/howto/new-command.html b/mingw64/share/doc/git-doc/howto/new-command.html index b618506e969..7406ee34332 100644 --- a/mingw64/share/doc/git-doc/howto/new-command.html +++ b/mingw64/share/doc/git-doc/howto/new-command.html @@ -585,7 +585,7 @@

    Integrating a command

    diff --git a/mingw64/share/doc/git-doc/howto/rebase-from-internal-branch.html b/mingw64/share/doc/git-doc/howto/rebase-from-internal-branch.html index f4686ac427a..cfc8f4bae78 100644 --- a/mingw64/share/doc/git-doc/howto/rebase-from-internal-branch.html +++ b/mingw64/share/doc/git-doc/howto/rebase-from-internal-branch.html @@ -657,7 +657,7 @@

    How to rebase from an internal branch

    diff --git a/mingw64/share/doc/git-doc/howto/rebuild-from-update-hook.html b/mingw64/share/doc/git-doc/howto/rebuild-from-update-hook.html index 7b1f80e965a..a4c8f514cf4 100644 --- a/mingw64/share/doc/git-doc/howto/rebuild-from-update-hook.html +++ b/mingw64/share/doc/git-doc/howto/rebuild-from-update-hook.html @@ -564,7 +564,7 @@

    How to rebuild from update hook

    diff --git a/mingw64/share/doc/git-doc/howto/recover-corrupted-blob-object.html b/mingw64/share/doc/git-doc/howto/recover-corrupted-blob-object.html index 9ef00821218..aac6c96596d 100644 --- a/mingw64/share/doc/git-doc/howto/recover-corrupted-blob-object.html +++ b/mingw64/share/doc/git-doc/howto/recover-corrupted-blob-object.html @@ -642,7 +642,7 @@

    How to recover a corrupted blob object

    diff --git a/mingw64/share/doc/git-doc/howto/recover-corrupted-object-harder.html b/mingw64/share/doc/git-doc/howto/recover-corrupted-object-harder.html index 2c2ab39ac2f..5a8b1711e0a 100644 --- a/mingw64/share/doc/git-doc/howto/recover-corrupted-object-harder.html +++ b/mingw64/share/doc/git-doc/howto/recover-corrupted-object-harder.html @@ -968,7 +968,7 @@

    The adventure continues…​

    diff --git a/mingw64/share/doc/git-doc/howto/revert-a-faulty-merge.html b/mingw64/share/doc/git-doc/howto/revert-a-faulty-merge.html index c429fc729ae..589b6e82111 100644 --- a/mingw64/share/doc/git-doc/howto/revert-a-faulty-merge.html +++ b/mingw64/share/doc/git-doc/howto/revert-a-faulty-merge.html @@ -830,7 +830,7 @@

    How to revert a faulty merge

    diff --git a/mingw64/share/doc/git-doc/howto/revert-branch-rebase.html b/mingw64/share/doc/git-doc/howto/revert-branch-rebase.html index 6eb74b69c3d..81abd77ec72 100644 --- a/mingw64/share/doc/git-doc/howto/revert-branch-rebase.html +++ b/mingw64/share/doc/git-doc/howto/revert-branch-rebase.html @@ -650,7 +650,7 @@

    How to revert an existing commit

    diff --git a/mingw64/share/doc/git-doc/howto/separating-topic-branches.html b/mingw64/share/doc/git-doc/howto/separating-topic-branches.html index 17ccda05454..dcb2d4220eb 100644 --- a/mingw64/share/doc/git-doc/howto/separating-topic-branches.html +++ b/mingw64/share/doc/git-doc/howto/separating-topic-branches.html @@ -569,7 +569,7 @@

    How to separate topic branches

    diff --git a/mingw64/share/doc/git-doc/howto/setup-git-server-over-http.html b/mingw64/share/doc/git-doc/howto/setup-git-server-over-http.html index 7e381354a73..465f5f52015 100644 --- a/mingw64/share/doc/git-doc/howto/setup-git-server-over-http.html +++ b/mingw64/share/doc/git-doc/howto/setup-git-server-over-http.html @@ -883,7 +883,7 @@

    Troubleshooting:

    diff --git a/mingw64/share/doc/git-doc/howto/update-hook-example.html b/mingw64/share/doc/git-doc/howto/update-hook-example.html index fb62061e735..2cccce32af2 100644 --- a/mingw64/share/doc/git-doc/howto/update-hook-example.html +++ b/mingw64/share/doc/git-doc/howto/update-hook-example.html @@ -649,7 +649,7 @@

    How to use the update hook

    diff --git a/mingw64/share/doc/git-doc/howto/use-git-daemon.html b/mingw64/share/doc/git-doc/howto/use-git-daemon.html index 474a77a4355..78424dfc257 100644 --- a/mingw64/share/doc/git-doc/howto/use-git-daemon.html +++ b/mingw64/share/doc/git-doc/howto/use-git-daemon.html @@ -525,7 +525,7 @@

    How to use git-daemon

    diff --git a/mingw64/share/doc/git-doc/howto/using-merge-subtree.html b/mingw64/share/doc/git-doc/howto/using-merge-subtree.html index f760b486563..b4a6475b5ce 100644 --- a/mingw64/share/doc/git-doc/howto/using-merge-subtree.html +++ b/mingw64/share/doc/git-doc/howto/using-merge-subtree.html @@ -555,7 +555,7 @@

    Additional tips

    diff --git a/mingw64/share/doc/git-doc/howto/using-signed-tag-in-pull-request.html b/mingw64/share/doc/git-doc/howto/using-signed-tag-in-pull-request.html index 55e3325cae1..431c32bcc8c 100644 --- a/mingw64/share/doc/git-doc/howto/using-signed-tag-in-pull-request.html +++ b/mingw64/share/doc/git-doc/howto/using-signed-tag-in-pull-request.html @@ -713,7 +713,7 @@

    Auditors

    diff --git a/mingw64/share/doc/git-doc/index.html b/mingw64/share/doc/git-doc/index.html index cca4abf0e74..5e553cdea08 100644 --- a/mingw64/share/doc/git-doc/index.html +++ b/mingw64/share/doc/git-doc/index.html @@ -2678,7 +2678,7 @@

    GIT

    diff --git a/mingw64/share/doc/git-doc/scalar.html b/mingw64/share/doc/git-doc/scalar.html index ec0bb43a6a1..08f74fe977b 100644 --- a/mingw64/share/doc/git-doc/scalar.html +++ b/mingw64/share/doc/git-doc/scalar.html @@ -689,7 +689,7 @@

    GIT

    diff --git a/mingw64/share/doc/git-doc/technical/api-error-handling.html b/mingw64/share/doc/git-doc/technical/api-error-handling.html index db12f0fc57d..a4ea78bd494 100644 --- a/mingw64/share/doc/git-doc/technical/api-error-handling.html +++ b/mingw64/share/doc/git-doc/technical/api-error-handling.html @@ -594,7 +594,7 @@

    Caller-handled errors

    diff --git a/mingw64/share/doc/git-doc/technical/api-index.html b/mingw64/share/doc/git-doc/technical/api-index.html index 288daf56891..e6c7fb7eedb 100644 --- a/mingw64/share/doc/git-doc/technical/api-index.html +++ b/mingw64/share/doc/git-doc/technical/api-index.html @@ -468,7 +468,7 @@

    Git API Documents

    diff --git a/mingw64/share/doc/git-doc/technical/api-merge.html b/mingw64/share/doc/git-doc/technical/api-merge.html index 0beef459dc1..eb5e94fc67d 100644 --- a/mingw64/share/doc/git-doc/technical/api-merge.html +++ b/mingw64/share/doc/git-doc/technical/api-merge.html @@ -508,7 +508,7 @@

    Low-level (single file) merge

    diff --git a/mingw64/share/doc/git-doc/technical/api-parse-options.html b/mingw64/share/doc/git-doc/technical/api-parse-options.html index 1fa23269200..52b44e2156b 100644 --- a/mingw64/share/doc/git-doc/technical/api-parse-options.html +++ b/mingw64/share/doc/git-doc/technical/api-parse-options.html @@ -926,7 +926,7 @@

    Examples

    diff --git a/mingw64/share/doc/git-doc/technical/api-simple-ipc.html b/mingw64/share/doc/git-doc/technical/api-simple-ipc.html index af2670c4e9b..15654dca7e6 100644 --- a/mingw64/share/doc/git-doc/technical/api-simple-ipc.html +++ b/mingw64/share/doc/git-doc/technical/api-simple-ipc.html @@ -569,7 +569,7 @@

    Summary

    diff --git a/mingw64/share/doc/git-doc/technical/api-trace2.html b/mingw64/share/doc/git-doc/technical/api-trace2.html index 5a88cb09343..aa1faab0e98 100644 --- a/mingw64/share/doc/git-doc/technical/api-trace2.html +++ b/mingw64/share/doc/git-doc/technical/api-trace2.html @@ -2052,7 +2052,7 @@

    Relationship to t diff --git a/mingw64/share/doc/git-doc/technical/bitmap-format.html b/mingw64/share/doc/git-doc/technical/bitmap-format.html index 797d550dd7e..3d5d36997a8 100644 --- a/mingw64/share/doc/git-doc/technical/bitmap-format.html +++ b/mingw64/share/doc/git-doc/technical/bitmap-format.html @@ -1089,7 +1089,7 @@

    File format

    diff --git a/mingw64/share/doc/git-doc/technical/bundle-uri.html b/mingw64/share/doc/git-doc/technical/bundle-uri.html index 2dbc4d9518c..d590aa8a968 100644 --- a/mingw64/share/doc/git-doc/technical/bundle-uri.html +++ b/mingw64/share/doc/git-doc/technical/bundle-uri.html @@ -1221,7 +1221,7 @@

    See Also

    diff --git a/mingw64/share/doc/git-doc/technical/hash-function-transition.html b/mingw64/share/doc/git-doc/technical/hash-function-transition.html index f83a0bee12e..a183cca866e 100644 --- a/mingw64/share/doc/git-doc/technical/hash-function-transition.html +++ b/mingw64/share/doc/git-doc/technical/hash-function-transition.html @@ -1808,7 +1808,7 @@

    Document History

    diff --git a/mingw64/share/doc/git-doc/technical/long-running-process-protocol.html b/mingw64/share/doc/git-doc/technical/long-running-process-protocol.html index e77f4fc5819..ffef314c461 100644 --- a/mingw64/share/doc/git-doc/technical/long-running-process-protocol.html +++ b/mingw64/share/doc/git-doc/technical/long-running-process-protocol.html @@ -507,7 +507,7 @@

    Shutdown

    diff --git a/mingw64/share/doc/git-doc/technical/multi-pack-index.html b/mingw64/share/doc/git-doc/technical/multi-pack-index.html index 182a7ebd334..fc18ef014ca 100644 --- a/mingw64/share/doc/git-doc/technical/multi-pack-index.html +++ b/mingw64/share/doc/git-doc/technical/multi-pack-index.html @@ -603,7 +603,7 @@

    Related Links

    diff --git a/mingw64/share/doc/git-doc/technical/pack-heuristics.html b/mingw64/share/doc/git-doc/technical/pack-heuristics.html index 895ee0d551b..a8885316c08 100644 --- a/mingw64/share/doc/git-doc/technical/pack-heuristics.html +++ b/mingw64/share/doc/git-doc/technical/pack-heuristics.html @@ -1213,7 +1213,7 @@

    Concerning Git’s Packing Heuristics

    diff --git a/mingw64/share/doc/git-doc/technical/parallel-checkout.html b/mingw64/share/doc/git-doc/technical/parallel-checkout.html index 8168e614506..4c5d02315e9 100644 --- a/mingw64/share/doc/git-doc/technical/parallel-checkout.html +++ b/mingw64/share/doc/git-doc/technical/parallel-checkout.html @@ -801,7 +801,7 @@

    The API

    diff --git a/mingw64/share/doc/git-doc/technical/partial-clone.html b/mingw64/share/doc/git-doc/technical/partial-clone.html index 640ab49c127..b43817bb00e 100644 --- a/mingw64/share/doc/git-doc/technical/partial-clone.html +++ b/mingw64/share/doc/git-doc/technical/partial-clone.html @@ -950,7 +950,7 @@

    Related Links

    diff --git a/mingw64/share/doc/git-doc/technical/racy-git.html b/mingw64/share/doc/git-doc/technical/racy-git.html index ecdc8ce76f5..4d68af3f529 100644 --- a/mingw64/share/doc/git-doc/technical/racy-git.html +++ b/mingw64/share/doc/git-doc/technical/racy-git.html @@ -693,7 +693,7 @@

    Avoiding runtime penalty

    diff --git a/mingw64/share/doc/git-doc/technical/reftable.html b/mingw64/share/doc/git-doc/technical/reftable.html index f287131734f..875f1a6b1f1 100644 --- a/mingw64/share/doc/git-doc/technical/reftable.html +++ b/mingw64/share/doc/git-doc/technical/reftable.html @@ -1994,7 +1994,7 @@

    LMDB

    diff --git a/mingw64/share/doc/git-doc/technical/scalar.html b/mingw64/share/doc/git-doc/technical/scalar.html index 1b6e664e286..c6892e12d73 100644 --- a/mingw64/share/doc/git-doc/technical/scalar.html +++ b/mingw64/share/doc/git-doc/technical/scalar.html @@ -542,7 +542,7 @@

    Design

    diff --git a/mingw64/share/doc/git-doc/technical/send-pack-pipeline.html b/mingw64/share/doc/git-doc/technical/send-pack-pipeline.html index 6986403b592..f8bff831d4e 100644 --- a/mingw64/share/doc/git-doc/technical/send-pack-pipeline.html +++ b/mingw64/share/doc/git-doc/technical/send-pack-pipeline.html @@ -531,7 +531,7 @@

    Pack_objects pipeline

    diff --git a/mingw64/share/doc/git-doc/technical/shallow.html b/mingw64/share/doc/git-doc/technical/shallow.html index 88b72ebd892..811fb92062b 100644 --- a/mingw64/share/doc/git-doc/technical/shallow.html +++ b/mingw64/share/doc/git-doc/technical/shallow.html @@ -523,7 +523,7 @@

    Shallow commits

    diff --git a/mingw64/share/doc/git-doc/technical/trivial-merge.html b/mingw64/share/doc/git-doc/technical/trivial-merge.html index 554de0a1158..65d62b21212 100644 --- a/mingw64/share/doc/git-doc/technical/trivial-merge.html +++ b/mingw64/share/doc/git-doc/technical/trivial-merge.html @@ -604,7 +604,7 @@

    Three-way merge

    diff --git a/mingw64/share/doc/git-doc/technical/unit-tests.html b/mingw64/share/doc/git-doc/technical/unit-tests.html index 30f0cc73ae8..5b37f9aff9f 100644 --- a/mingw64/share/doc/git-doc/technical/unit-tests.html +++ b/mingw64/share/doc/git-doc/technical/unit-tests.html @@ -912,7 +912,7 @@

    Milestones

    diff --git a/mingw64/share/git/compat-bash.exe b/mingw64/share/git/compat-bash.exe index 856d7670fb2..f9663524e37 100755 Binary files a/mingw64/share/git/compat-bash.exe and b/mingw64/share/git/compat-bash.exe differ diff --git a/mingw64/share/git/edit-git-bash.exe b/mingw64/share/git/edit-git-bash.exe index 83acb323130..f11cd05853f 100644 Binary files a/mingw64/share/git/edit-git-bash.exe and b/mingw64/share/git/edit-git-bash.exe differ diff --git a/mingw64/share/git/git-wrapper.exe b/mingw64/share/git/git-wrapper.exe index 521c279a765..dacc3f1cd2e 100644 Binary files a/mingw64/share/git/git-wrapper.exe and b/mingw64/share/git/git-wrapper.exe differ diff --git a/mingw64/share/gitweb/gitweb.cgi b/mingw64/share/gitweb/gitweb.cgi index 3ce4d43a6bc..53c4b568d51 100755 --- a/mingw64/share/gitweb/gitweb.cgi +++ b/mingw64/share/gitweb/gitweb.cgi @@ -35,7 +35,7 @@ BEGIN { CGI->compile() if $ENV{'MOD_PERL'}; } -our $version = "2.46.0.windows.1"; +our $version = "2.46.1.windows.1"; our ($my_url, $my_uri, $base_url, $path_info, $home_link); sub evaluate_uri { diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/mtree deleted file mode 100644 index b604dfbe753..00000000000 Binary files a/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/mtree and /dev/null differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/desc similarity index 92% rename from var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/desc rename to var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/desc index 2d60dea8ada..e152ef3792c 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/desc @@ -2,7 +2,7 @@ mingw-w64-x86_64-git %VERSION% -2.46.0.1.2e6a859ffc-1 +2.46.1.1.6cd9c8395e-1 %BASE% mingw-w64-git @@ -17,16 +17,16 @@ https://git-for-windows.github.io/ any %BUILDDATE% -1722277089 +1726647861 %INSTALLDATE% -1722308371 +1726715431 %PACKAGER% gitforwindowshelper[bot] %SIZE% -54022973 +54282616 %LICENSE% GPL2 diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/files b/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/files similarity index 100% rename from var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/files rename to var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/files diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/install b/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/install similarity index 100% rename from var/lib/pacman/local/mingw-w64-x86_64-git-2.46.0.1.2e6a859ffc-1/install rename to var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/install diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/mtree new file mode 100644 index 00000000000..e2aa21c4923 Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-x86_64-git-2.46.1.1.6cd9c8395e-1/mtree differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/mtree deleted file mode 100644 index 1a624cf0919..00000000000 Binary files a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/mtree and /dev/null differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/desc similarity index 92% rename from var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/desc rename to var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/desc index 6957ee7333e..ab4774add44 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/desc @@ -2,7 +2,7 @@ mingw-w64-x86_64-git-doc-html %VERSION% -2.46.0.1.2e6a859ffc-1 +2.46.1.1.6cd9c8395e-1 %BASE% mingw-w64-git @@ -17,16 +17,16 @@ https://git-for-windows.github.io/ any %BUILDDATE% -1722277089 +1726647861 %INSTALLDATE% -1722308372 +1726715432 %PACKAGER% gitforwindowshelper[bot] %SIZE% -17549811 +17560312 %LICENSE% GPL2 diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/files b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/files similarity index 99% rename from var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/files rename to var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/files index b7d998b0dff..5b35eccafba 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/files +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/files @@ -961,6 +961,7 @@ mingw64/share/doc/git-doc/RelNotes/2.45.1.txt mingw64/share/doc/git-doc/RelNotes/2.45.2.txt mingw64/share/doc/git-doc/RelNotes/2.45.3.txt mingw64/share/doc/git-doc/RelNotes/2.46.0.txt +mingw64/share/doc/git-doc/RelNotes/2.46.1.txt mingw64/share/doc/git-doc/RelNotes/2.5.0.txt mingw64/share/doc/git-doc/RelNotes/2.5.1.txt mingw64/share/doc/git-doc/RelNotes/2.5.2.txt diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/install b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/install similarity index 100% rename from var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.0.1.2e6a859ffc-1/install rename to var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/install diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/mtree new file mode 100644 index 00000000000..f2d4ec24c00 Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.46.1.1.6cd9c8395e-1/mtree differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc index fa4a1d994c3..0451cc9b548 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc @@ -20,7 +20,7 @@ any 1718204260 %INSTALLDATE% -1726647340 +1726715434 %PACKAGER% Johannes Schindelin diff --git a/var/lib/pacman/sync/clang32.db b/var/lib/pacman/sync/clang32.db index 44f1f724507..7384abf013f 100644 Binary files a/var/lib/pacman/sync/clang32.db and b/var/lib/pacman/sync/clang32.db differ diff --git a/var/lib/pacman/sync/clang32.db.sig b/var/lib/pacman/sync/clang32.db.sig index 6a8f241f13e..bba5d0d3faf 100644 Binary files a/var/lib/pacman/sync/clang32.db.sig and b/var/lib/pacman/sync/clang32.db.sig differ diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db index 0050608ea97..186505bd89f 100644 Binary files a/var/lib/pacman/sync/clang64.db and b/var/lib/pacman/sync/clang64.db differ diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig index dec19c9dfb2..55f538b8b68 100644 Binary files a/var/lib/pacman/sync/clang64.db.sig and b/var/lib/pacman/sync/clang64.db.sig differ diff --git a/var/lib/pacman/sync/clangarm64.db b/var/lib/pacman/sync/clangarm64.db index 60014b13291..99c70d383dc 100644 Binary files a/var/lib/pacman/sync/clangarm64.db and b/var/lib/pacman/sync/clangarm64.db differ diff --git a/var/lib/pacman/sync/clangarm64.db.sig b/var/lib/pacman/sync/clangarm64.db.sig index 74f2f26c265..c6dbd2a2f0e 100644 Binary files a/var/lib/pacman/sync/clangarm64.db.sig and b/var/lib/pacman/sync/clangarm64.db.sig differ diff --git a/var/lib/pacman/sync/git-for-windows-mingw32.db b/var/lib/pacman/sync/git-for-windows-mingw32.db index 52ebdcd167a..5eb460a9194 100644 Binary files a/var/lib/pacman/sync/git-for-windows-mingw32.db and b/var/lib/pacman/sync/git-for-windows-mingw32.db differ diff --git a/var/lib/pacman/sync/git-for-windows-mingw32.db.sig b/var/lib/pacman/sync/git-for-windows-mingw32.db.sig index 73327b6e4ec..62f5894e1e4 100644 Binary files a/var/lib/pacman/sync/git-for-windows-mingw32.db.sig and b/var/lib/pacman/sync/git-for-windows-mingw32.db.sig differ diff --git a/var/lib/pacman/sync/git-for-windows.db b/var/lib/pacman/sync/git-for-windows.db index 9f09c154c59..83bb591140c 100644 Binary files a/var/lib/pacman/sync/git-for-windows.db and b/var/lib/pacman/sync/git-for-windows.db differ diff --git a/var/lib/pacman/sync/git-for-windows.db.sig b/var/lib/pacman/sync/git-for-windows.db.sig index e61f8207b04..a58b5c49900 100644 Binary files a/var/lib/pacman/sync/git-for-windows.db.sig and b/var/lib/pacman/sync/git-for-windows.db.sig differ diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db index e8a88ecca7f..b8d6ea40531 100644 Binary files a/var/lib/pacman/sync/mingw32.db and b/var/lib/pacman/sync/mingw32.db differ diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig index 9a1a3786f0b..fc82a0514ad 100644 Binary files a/var/lib/pacman/sync/mingw32.db.sig and b/var/lib/pacman/sync/mingw32.db.sig differ diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db index 2964bc8b282..804db98c9b8 100644 Binary files a/var/lib/pacman/sync/mingw64.db and b/var/lib/pacman/sync/mingw64.db differ diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig index e6c12f4d992..a6f216770ba 100644 Binary files a/var/lib/pacman/sync/mingw64.db.sig and b/var/lib/pacman/sync/mingw64.db.sig differ diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db index 713e7a42bb3..368b7fa8ec5 100644 Binary files a/var/lib/pacman/sync/ucrt64.db and b/var/lib/pacman/sync/ucrt64.db differ diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig index 82296071d1d..4b178b5b761 100644 Binary files a/var/lib/pacman/sync/ucrt64.db.sig and b/var/lib/pacman/sync/ucrt64.db.sig differ