diff --git a/cmd/git-gui.exe b/cmd/git-gui.exe index 66ef3d3133f..e955df351ab 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 3784cd611cf..4644543957a 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 0dfae8e489f..231707df9e0 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 4f7d84144e4..e58f7fbee25 100755 Binary files a/cmd/git.exe and b/cmd/git.exe differ diff --git a/cmd/gitk.exe b/cmd/gitk.exe index 04f5be99032..173686de2a8 100755 Binary files a/cmd/gitk.exe and b/cmd/gitk.exe differ diff --git a/cmd/scalar.exe b/cmd/scalar.exe index 4f7d84144e4..e58f7fbee25 100644 Binary files a/cmd/scalar.exe and b/cmd/scalar.exe differ diff --git a/git-bash.exe b/git-bash.exe index 70fb751a852..4dfe1a588ca 100755 Binary files a/git-bash.exe and b/git-bash.exe differ diff --git a/git-cmd.exe b/git-cmd.exe index 5651c72de86..f4300efafa2 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 cade8324b2d..3bd11437f2a 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.43.0.rc0.windows.1'; +my $VERSION = '2.43.0.rc1.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 fffd42b0210..fe7bb6c4b85 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 34168b8f0f1..9e4a09cfb55 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 fffd42b0210..fe7bb6c4b85 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 fffd42b0210..fe7bb6c4b85 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 01c78772a04..96bc8ccb1ce 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 bd173e6aad1..a6bcf3e68a2 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 892fe652f09..64505a2ad4b 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 cade8324b2d..3bd11437f2a 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.43.0.rc0.windows.1'; +my $VERSION = '2.43.0.rc1.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 2d4977d7fa5..5680e035f75 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 21fa472170e..21338cbd008 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 b2637e296cc..91f5f892a8f 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 86e66111e2d..74f678d02e9 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 b61db53aa6c..097bdcf0a8b 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 4c35b77942c..b2db8654cdc 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 4c35b77942c..b2db8654cdc 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 4c35b77942c..b2db8654cdc 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 4c35b77942c..b2db8654cdc 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 1feada98ba6..b2489d8db94 100755 --- a/mingw64/libexec/git-core/git-send-email +++ b/mingw64/libexec/git-core/git-send-email @@ -842,30 +842,6 @@ $sender = sanitize_address($sender); $time = time - scalar $#files; -if ($validate) { - # FIFOs can only be read once, exclude them from validation. - my @real_files = (); - foreach my $f (@files) { - unless (-p $f) { - push(@real_files, $f); - } - } - - # Run the loop once again to avoid gaps in the counter due to FIFO - # arguments provided by the user. - my $num = 1; - my $num_files = scalar @real_files; - $ENV{GIT_SENDEMAIL_FILE_TOTAL} = "$num_files"; - foreach my $r (@real_files) { - $ENV{GIT_SENDEMAIL_FILE_COUNTER} = "$num"; - pre_process_file($r, 1); - validate_patch($r, $target_xfer_encoding); - $num += 1; - } - delete $ENV{GIT_SENDEMAIL_FILE_COUNTER}; - delete $ENV{GIT_SENDEMAIL_FILE_TOTAL}; -} - @files = handle_backup_files(@files); if (@files) { @@ -1536,7 +1512,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.43.0.rc0.windows.1'; + my $gitversion = '2.43.0.rc1.windows.1'; if ($gitversion =~ m/..GIT_VERSION../) { $gitversion = Git::version(); } @@ -1769,10 +1745,6 @@ EOF return 1; } -$in_reply_to = $initial_in_reply_to; -$references = $initial_in_reply_to || ''; -$message_num = 0; - sub pre_process_file { my ($t, $quiet) = @_; @@ -2038,6 +2010,38 @@ sub process_file { return 1; } +sub initialize_modified_loop_vars { + $in_reply_to = $initial_in_reply_to; + $references = $initial_in_reply_to || ''; + $message_num = 0; +} + +if ($validate) { + # FIFOs can only be read once, exclude them from validation. + my @real_files = (); + foreach my $f (@files) { + unless (-p $f) { + push(@real_files, $f); + } + } + + # Run the loop once again to avoid gaps in the counter due to FIFO + # arguments provided by the user. + my $num = 1; + my $num_files = scalar @real_files; + $ENV{GIT_SENDEMAIL_FILE_TOTAL} = "$num_files"; + initialize_modified_loop_vars(); + foreach my $r (@real_files) { + $ENV{GIT_SENDEMAIL_FILE_COUNTER} = "$num"; + pre_process_file($r, 1); + validate_patch($r, $target_xfer_encoding); + $num += 1; + } + delete $ENV{GIT_SENDEMAIL_FILE_COUNTER}; + delete $ENV{GIT_SENDEMAIL_FILE_TOTAL}; +} + +initialize_modified_loop_vars(); foreach my $t (@files) { while (!process_file($t)) { # user edited the file diff --git a/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe b/mingw64/libexec/git-core/git-sh-i18n--envsubst.exe index 233fe763633..17a164447d5 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 34168b8f0f1..9e4a09cfb55 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 cd6e4f516c7..0c493680124 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.43.0.rc0.windows.1'; +$VERSION = '2.43.0.rc1.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 01c78772a04..96bc8ccb1ce 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 fe6bb8b48c1..a0b94cf2710 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 bd173e6aad1..a6bcf3e68a2 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/MyFirstContribution.html b/mingw64/share/doc/git-doc/MyFirstContribution.html index 06710625365..49234341c33 100644 --- a/mingw64/share/doc/git-doc/MyFirstContribution.html +++ b/mingw64/share/doc/git-doc/MyFirstContribution.html @@ -655,11 +655,12 @@

Adding a
-

Be sure to #include "builtin.h" in your psuh.c.

+

Be sure to #include "builtin.h" in your psuh.c. You’ll also need to +#include "gettext.h" to use functions related to printing output text.

-

Go ahead and add some throwaway printf to that function. This is a decent -starting point as we can now add build rules and register the command.

+

Go ahead and add some throwaway printf to the cmd_psuh function. This is a +decent starting point as we can now add build rules and register the command.

@@ -2216,7 +2217,7 @@

After Revie diff --git a/mingw64/share/doc/git-doc/MyFirstContribution.txt b/mingw64/share/doc/git-doc/MyFirstContribution.txt index 62d11a5cd7f..7cfed60c2e9 100644 --- a/mingw64/share/doc/git-doc/MyFirstContribution.txt +++ b/mingw64/share/doc/git-doc/MyFirstContribution.txt @@ -160,10 +160,11 @@ in order to keep the declarations alphabetically sorted: int cmd_psuh(int argc, const char **argv, const char *prefix); ---- -Be sure to `#include "builtin.h"` in your `psuh.c`. +Be sure to `#include "builtin.h"` in your `psuh.c`. You'll also need to +`#include "gettext.h"` to use functions related to printing output text. -Go ahead and add some throwaway printf to that function. This is a decent -starting point as we can now add build rules and register the command. +Go ahead and add some throwaway printf to the `cmd_psuh` function. This is a +decent starting point as we can now add build rules and register the command. NOTE: Your throwaway text, as well as much of the text you will be adding over the course of this tutorial, is user-facing. That means it needs to be diff --git a/mingw64/share/doc/git-doc/MyFirstObjectWalk.html b/mingw64/share/doc/git-doc/MyFirstObjectWalk.html index a5249ea0324..7a1001d69b3 100644 --- a/mingw64/share/doc/git-doc/MyFirstObjectWalk.html +++ b/mingw64/share/doc/git-doc/MyFirstObjectWalk.html @@ -1670,7 +1670,7 @@

Wrapping Up

diff --git a/mingw64/share/doc/git-doc/RelNotes/2.43.0.txt b/mingw64/share/doc/git-doc/RelNotes/2.43.0.txt index ad3b82fe0a2..74f304b1b2b 100644 --- a/mingw64/share/doc/git-doc/RelNotes/2.43.0.txt +++ b/mingw64/share/doc/git-doc/RelNotes/2.43.0.txt @@ -16,7 +16,7 @@ Backward Compatibility Notes rule is that "--not" given from the command line only affects revs given from the command line that comes but not revs read from the standard input, and "--not" read from the standard input affects - revs given from the stanrdard input and not revs given from the + revs given from the standard input and not revs given from the command line. UI, Workflows & Features @@ -37,8 +37,9 @@ UI, Workflows & Features oath token and password expiration data) are stored in libsecret keyrings has been rethought. - * Update two credential helpers to correctly match which credential - to erase; they dropped not the ones with stale password. + * Update the libsecret and wincred credential helpers to correctly + match which credential to erase; they erased the wrong entry in + some cases. * Git GUI updates. @@ -62,7 +63,7 @@ UI, Workflows & Features describe complex "revert of revert of revert" situation better in their own words. - * The command-line complation support (in contrib/) learned to + * The command-line completion support (in contrib/) learned to complete "git commit --trailer=" for possible trailer keys. * "git update-index" learns "--show-index-version" to inspect @@ -98,6 +99,9 @@ UI, Workflows & Features * The attribute subsystem learned to honor `attr.tree` configuration that specifies which tree to read the .gitattributes files from. + * "git merge-file" learns a mode to read three contents to be merged + from blob objects. + Performance, Internal Implementation, Development Support etc. @@ -109,16 +113,13 @@ Performance, Internal Implementation, Development Support etc. the help text is optional. * Tests that are known to pass with LSan are now marked as such. - (merge 5fafe8c95f tb/mark-more-tests-as-leak-free later to maint). * Flaky "git p4" tests, as well as "git svn" tests, are now skipped in the (rather expensive) sanitizer CI job. - (merge 6ba913629f js/ci-san-skip-p4-and-svn-tests later to maint). * Tests with LSan from time to time seem to emit harmless message that makes our tests unnecessarily flaky; we work it around by filtering the uninteresting output. - (merge 370ef7e40d jk/test-lsan-denoise-output later to maint). * Unused parameters to functions are marked as such, and/or removed, in order to bring us closer to -Wunused-parameter clean. @@ -131,57 +132,49 @@ Performance, Internal Implementation, Development Support etc. functionality. * GitHub CI workflow has learned to trigger Coverity check. - (merge 3349520e1a js/ci-coverity later to maint). * Test coverage for trailers has been improved. * The code to iterate over loose references have been optimized to reduce the number of lstat() system calls. - (merge 2cdb796101 vd/loose-ref-iteration-optimization later to maint). * The codepaths that read "chunk" formatted files have been corrected to pay attention to the chunk size and notice broken files. + * Replace macos-12 used at GitHub CI with macos-13. + (merge 682a868f67 js/ci-use-macos-13 later to maint). + Fixes since v2.42 ----------------- * Overly long label names used in the sequencer machinery are now chopped to fit under filesystem limitation. - (merge ac300bda10 mp/rebase-label-length-limit later to maint). * Scalar updates. - (merge f9a547d3a7 ds/scalar-updates later to maint). * Tweak GitHub Actions CI so that pushing the same commit to multiple branch tips at the same time will not waste building and testing the same thing twice. - (merge 99fe06cbfd jc/ci-skip-same-commit later to maint). * The commit-graph verification code that detects mixture of zero and non-zero generation numbers has been updated. - (merge db6044d762 tb/commit-graph-verify-fix later to maint). * "git diff -w --exit-code" with various options did not work correctly, which is being addressed. - (merge a64f8b2595 jc/diff-exit-code-with-w-fixes later to maint). * transfer.unpackLimit ought to be used as a fallback, but overrode fetch.unpackLimit and receive.unpackLimit instead. - (merge f3d33f8cfe ts/unpacklimit-config-fix later to maint). * The use of API between two calls to require_clean_work_tree() from the sequencer code has been cleaned up for consistency. - (merge a9b5955e07 ob/sequencer-empty-hint-fix later to maint). * "git diff --no-such-option" and other corner cases around the exit status of the "diff" command has been corrected. - (merge 5cc6b2d70b jk/diff-result-code-cleanup later to maint). * "git for-each-ref --sort='contents:size'" sorts the refs according to size numerically, giving a ref that points at a blob twelve-byte (12) long before showing a blob hundred-byte (100) long. - (merge 6d79cd8474 ks/ref-filter-sort-numerically later to maint). * We now limit depth of the tree objects and maximum length of pathnames recorded in tree objects. @@ -189,51 +182,40 @@ Fixes since v2.42 * Various fixes to the behavior of "rebase -i" when the command got interrupted by conflicting changes. - (merge 203573b024 pw/rebase-i-after-failure later to maint). * References from description of the `--patch` option in various manual pages have been simplified and improved. - (merge 11422f23e3 so/diff-doc-for-patch-update later to maint). * "git grep -e A --no-or -e B" is accepted, even though the negation of "or" did not mean anything, which has been tightened. - (merge aae8558b10 rs/grep-no-no-or later to maint). * The completion script (in contrib/) has been taught to treat the "-t" option to "git checkout" and "git switch" just like the "--track" option, to complete remote-tracking branches. - (merge 9f892830d6 js/complete-checkout-t later to maint). * "git diff --no-index -R <(one) <(two)" did not work correctly, which has been corrected. - (merge 48944f214c pw/diff-no-index-from-named-pipes later to maint). * Update "git maintenance" timers' implementation based on systemd timers to work with WSL. - (merge 5e8515e8e8 js/systemd-timers-wsl-fix later to maint). * "git diff --cached" codepath did not fill the necessary stat information for a file when fsmonitor knows it is clean and ended up behaving as if it is not clean, which has been corrected. - (merge 6a044a2048 js/diff-cached-fsmonitor-fix later to maint). * Clarify how "alias.foo = : git cmd ; aliased-command-string" should be spelled with necessary whitespaces around punctuation marks to work. - (merge 4333267995 pb/completion-aliases-doc later to maint). * HTTP Header redaction code has been adjusted for a newer version of cURL library that shows its traces differently from earlier versions. - (merge 0763c3a2c4 jk/redact-h2h3-headers-fix later to maint). * An error message given by "git send-email" when given a malformed address did not give correct information, which has been corrected. - (merge 12288cc44e tb/send-email-extract-valid-address-error-message-fix later to maint). * UBSan options were not propagated through the test framework to git run via the httpd, unlike ASan options, which has been corrected. - (merge 252d693797 jk/test-pass-ubsan-options-to-http-test later to maint). * "checkout --merge -- path" and "update-index --unresolve path" did not resurrect conflicted state that was resolved to remove path, @@ -290,35 +272,38 @@ Fixes since v2.42 been corrected. (merge 3ec6167567 jk/send-email-fix-addresses-from-composed-messages later to maint). + * "cd sub && git grep -f patterns" tried to read "patterns" file at + the top level of the working tree; it has been corrected to read + "sub/patterns" instead. + + + * "git reflog expire --single-worktree" has been broken for the past + 20 months or so, which has been corrected. + + * "git send-email" did not have certain pieces of data computed yet + when it tried to validate the outging messages and its recipient + addresses, which has been sorted out. + + * "git bugreport" learned to complain when it received a command line + argument that it will not use. + + * The codepath to traverse the commit-graph learned to notice that a + commit is missing (e.g., corrupt repository lost an object), even + though it knows something about the commit (like its parents) from + what is in commit-graph. + (merge 7a5d604443 ps/do-not-trust-commit-graph-blindly-for-existence later to maint). + + * "git rev-list --missing" did not work for missing commit objects, + which has been corrected. + + * "git rev-list --unpacked --objects" failed to exclude packed + non-commit objects, which has been corrected. + (merge 7b3c8e9f38 tb/rev-list-unpacked-fix later to maint). + * Other code cleanup, docfix, build fix, etc. - (merge fd3ba590d8 ws/git-push-doc-grammofix later to maint). - (merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint). - (merge beaa1d952b jk/function-pointer-mismatches-fix later to maint). - (merge b46d806ea5 ob/t9001-indent-fix later to maint). - (merge fdc9914c28 ja/worktree-orphan later to maint). - (merge c2cbefc510 jc/mv-d-to-d-error-message-fix later to maint). - (merge d0fc552bfc ch/t6300-verify-commit-test-cleanup later to maint). - (merge aa4b83dd5e ws/git-svn-retire-faketerm later to maint). - (merge edf80d23f1 jk/ci-retire-allow-ref later to maint). - (merge 256a94ef6c bc/more-git-var later to maint). - (merge 82af2c639c ob/sequencer-reword-error-message later to maint). - (merge 2a63c79dae rs/grep-parseopt-simplify later to maint). - (merge 078c42531e rs/name-rev-use-opt-hidden-bool later to maint). - (merge 63642d58b4 ob/sequencer-remove-dead-code later to maint). - (merge 8aae489756 ob/t3404-typofix later to maint). - (merge 58be11432e eg/config-type-path-docfix later to maint). - (merge 563f339d98 ch/clean-docfix later to maint). - (merge 4fbe83fcd9 hy/doc-show-is-like-log-not-diff-tree later to maint). - (merge 43abaaf008 ob/am-msgfix later to maint). (merge c2c349a15c xz/commit-title-soft-limit-doc later to maint). - (merge f4cbb32c27 rs/parse-opt-ctx-cleanup later to maint). - (merge badf2fe1c3 jk/decoration-and-other-leak-fixes later to maint). - (merge cebfaaa333 sn/cat-file-doc-update later to maint). - (merge 8b3aa36f5a ps/rewritten-is-per-worktree-doc later to maint). - (merge ffbf6a748d jc/update-list-references-to-lore later to maint). - (merge 14d569b1a7 jc/am-doc-whitespace-action-fix later to maint). - (merge 48399e9cf0 ni/die-message-fix-for-git-add later to maint). - (merge ca3285dd69 ps/git-repack-doc-fixes later to maint). - (merge 243c79fdc7 wx/merge-ort-comment-typofix later to maint). - (merge a060705d94 jc/commit-new-underscore-index-fix later to maint). - (merge f6d83e2115 ms/doc-push-fix later to maint). + (merge 1bd809938a tb/format-pack-doc-update later to maint). + (merge 8f81532599 an/clang-format-typofix later to maint). + (merge 3ca86adc2d la/strvec-header-fix later to maint). + (merge 6789275d37 jc/test-i18ngrep later to maint). + (merge 9972cd6004 ps/leakfixes later to maint). diff --git a/mingw64/share/doc/git-doc/ReviewingGuidelines.html b/mingw64/share/doc/git-doc/ReviewingGuidelines.html index 7ee6bd23b4b..28de2f2af86 100644 --- a/mingw64/share/doc/git-doc/ReviewingGuidelines.html +++ b/mingw64/share/doc/git-doc/ReviewingGuidelines.html @@ -663,7 +663,7 @@

See Also

diff --git a/mingw64/share/doc/git-doc/SubmittingPatches.html b/mingw64/share/doc/git-doc/SubmittingPatches.html index f7c6a4ae031..0d74fe2b186 100644 --- a/mingw64/share/doc/git-doc/SubmittingPatches.html +++ b/mingw64/share/doc/git-doc/SubmittingPatches.html @@ -785,7 +785,7 @@

Describe your changes well.

-

The "Copy commit summary" command of gitk can be used to obtain this +

The "Copy commit reference" command of gitk can be used to obtain this format (with the subject enclosed in a pair of double-quotes), or this invocation of git show:

@@ -1364,7 +1364,7 @@

Gnus

diff --git a/mingw64/share/doc/git-doc/SubmittingPatches.txt b/mingw64/share/doc/git-doc/SubmittingPatches.txt index 965e02e754f..bce7f97815c 100644 --- a/mingw64/share/doc/git-doc/SubmittingPatches.txt +++ b/mingw64/share/doc/git-doc/SubmittingPatches.txt @@ -266,7 +266,7 @@ date)", like this: noticed that ... .... -The "Copy commit summary" command of gitk can be used to obtain this +The "Copy commit reference" command of gitk can be used to obtain this format (with the subject enclosed in a pair of double-quotes), or this invocation of `git show`: diff --git a/mingw64/share/doc/git-doc/ToolsForGit.html b/mingw64/share/doc/git-doc/ToolsForGit.html index 7015c96f073..ffbb231a205 100644 --- a/mingw64/share/doc/git-doc/ToolsForGit.html +++ b/mingw64/share/doc/git-doc/ToolsForGit.html @@ -520,7 +520,7 @@

-Last updated 2023-11-03 08:04:06 UTC +Last updated 2023-11-08 19:16:20 UTC
diff --git a/mingw64/share/doc/git-doc/everyday.html b/mingw64/share/doc/git-doc/everyday.html index ad84b63583f..5e24643de70 100644 --- a/mingw64/share/doc/git-doc/everyday.html +++ b/mingw64/share/doc/git-doc/everyday.html @@ -457,7 +457,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 52736b55c09..2b2c363ce8f 100644 --- a/mingw64/share/doc/git-doc/git-add.html +++ b/mingw64/share/doc/git-doc/git-add.html @@ -1033,7 +1033,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-am.html b/mingw64/share/doc/git-doc/git-am.html index 6c7bf7c97c6..c3a5a34fabf 100644 --- a/mingw64/share/doc/git-doc/git-am.html +++ b/mingw64/share/doc/git-doc/git-am.html @@ -838,7 +838,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-annotate.html b/mingw64/share/doc/git-doc/git-annotate.html index 912e5595559..362d3ff814b 100644 --- a/mingw64/share/doc/git-doc/git-annotate.html +++ b/mingw64/share/doc/git-doc/git-annotate.html @@ -712,7 +712,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-apply.html b/mingw64/share/doc/git-doc/git-apply.html index d7917fd632c..339d1d657cb 100644 --- a/mingw64/share/doc/git-doc/git-apply.html +++ b/mingw64/share/doc/git-doc/git-apply.html @@ -833,7 +833,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-archimport.html b/mingw64/share/doc/git-doc/git-archimport.html index 8d5b08b7786..1dcd4ea7f7e 100644 --- a/mingw64/share/doc/git-doc/git-archimport.html +++ b/mingw64/share/doc/git-doc/git-archimport.html @@ -588,7 +588,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-archive.html b/mingw64/share/doc/git-doc/git-archive.html index c17fa878922..6c102521523 100644 --- a/mingw64/share/doc/git-doc/git-archive.html +++ b/mingw64/share/doc/git-doc/git-archive.html @@ -758,7 +758,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-bash.html b/mingw64/share/doc/git-doc/git-bash.html index b9167abcf9b..d2a9b907644 100644 --- a/mingw64/share/doc/git-doc/git-bash.html +++ b/mingw64/share/doc/git-doc/git-bash.html @@ -576,7 +576,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 6bf7ae9ef81..67d80e55807 100644 --- a/mingw64/share/doc/git-doc/git-bisect-lk2009.html +++ b/mingw64/share/doc/git-doc/git-bisect-lk2009.html @@ -2131,7 +2131,7 @@

References

diff --git a/mingw64/share/doc/git-doc/git-bisect.html b/mingw64/share/doc/git-doc/git-bisect.html index 4a991d85385..8437e201494 100644 --- a/mingw64/share/doc/git-doc/git-bisect.html +++ b/mingw64/share/doc/git-doc/git-bisect.html @@ -1086,7 +1086,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-blame.html b/mingw64/share/doc/git-doc/git-blame.html index 27f97249b75..af4fe8f23ea 100644 --- a/mingw64/share/doc/git-doc/git-blame.html +++ b/mingw64/share/doc/git-doc/git-blame.html @@ -1094,7 +1094,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-branch.html b/mingw64/share/doc/git-doc/git-branch.html index c105abccf24..a52e19e30f6 100644 --- a/mingw64/share/doc/git-doc/git-branch.html +++ b/mingw64/share/doc/git-doc/git-branch.html @@ -1122,7 +1122,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-bugreport.html b/mingw64/share/doc/git-doc/git-bugreport.html index 9bdad5f33f9..7688aa04d0d 100644 --- a/mingw64/share/doc/git-doc/git-bugreport.html +++ b/mingw64/share/doc/git-doc/git-bugreport.html @@ -563,7 +563,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-bundle.html b/mingw64/share/doc/git-doc/git-bundle.html index aac30a6b00b..b6c8f346828 100644 --- a/mingw64/share/doc/git-doc/git-bundle.html +++ b/mingw64/share/doc/git-doc/git-bundle.html @@ -859,7 +859,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 415cf9682d5..1502e6afaac 100644 --- a/mingw64/share/doc/git-doc/git-cat-file.html +++ b/mingw64/share/doc/git-doc/git-cat-file.html @@ -1011,7 +1011,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-check-attr.html b/mingw64/share/doc/git-doc/git-check-attr.html index be1b05edced..ac116660966 100644 --- a/mingw64/share/doc/git-doc/git-check-attr.html +++ b/mingw64/share/doc/git-doc/git-check-attr.html @@ -655,7 +655,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 e8c5c6325e4..6db11d4f3a7 100644 --- a/mingw64/share/doc/git-doc/git-check-ignore.html +++ b/mingw64/share/doc/git-doc/git-check-ignore.html @@ -615,7 +615,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 fb92531fb53..c6d1457bd58 100644 --- a/mingw64/share/doc/git-doc/git-check-mailmap.html +++ b/mingw64/share/doc/git-doc/git-check-mailmap.html @@ -516,7 +516,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 f5b18837d46..9c4e28e7be9 100644 --- a/mingw64/share/doc/git-doc/git-check-ref-format.html +++ b/mingw64/share/doc/git-doc/git-check-ref-format.html @@ -638,7 +638,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 a8d04e89ac6..a2d3152dd54 100644 --- a/mingw64/share/doc/git-doc/git-checkout-index.html +++ b/mingw64/share/doc/git-doc/git-checkout-index.html @@ -690,7 +690,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-checkout.html b/mingw64/share/doc/git-doc/git-checkout.html index f29f4d09768..594f29103fe 100644 --- a/mingw64/share/doc/git-doc/git-checkout.html +++ b/mingw64/share/doc/git-doc/git-checkout.html @@ -1275,7 +1275,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 891eb123e2f..ba4fb5fd64c 100644 --- a/mingw64/share/doc/git-doc/git-cherry-pick.html +++ b/mingw64/share/doc/git-doc/git-cherry-pick.html @@ -793,7 +793,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cherry.html b/mingw64/share/doc/git-doc/git-cherry.html index 2b903d6f147..d762bd45eb1 100644 --- a/mingw64/share/doc/git-doc/git-cherry.html +++ b/mingw64/share/doc/git-doc/git-cherry.html @@ -628,7 +628,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-citool.html b/mingw64/share/doc/git-doc/git-citool.html index 3d7f33e291a..6a3dfd924a8 100644 --- a/mingw64/share/doc/git-doc/git-citool.html +++ b/mingw64/share/doc/git-doc/git-citool.html @@ -479,7 +479,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-clean.html b/mingw64/share/doc/git-doc/git-clean.html index 249e218e265..fd4128c43ba 100644 --- a/mingw64/share/doc/git-doc/git-clean.html +++ b/mingw64/share/doc/git-doc/git-clean.html @@ -646,7 +646,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-clone.html b/mingw64/share/doc/git-doc/git-clone.html index 5b15984c8bc..6840d55c83b 100644 --- a/mingw64/share/doc/git-doc/git-clone.html +++ b/mingw64/share/doc/git-doc/git-clone.html @@ -1094,7 +1094,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-column.html b/mingw64/share/doc/git-doc/git-column.html index 41f859e9a4e..55925ec9d1f 100644 --- a/mingw64/share/doc/git-doc/git-column.html +++ b/mingw64/share/doc/git-doc/git-column.html @@ -666,7 +666,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 3433fa7c706..7bcdd15a238 100644 --- a/mingw64/share/doc/git-doc/git-commit-graph.html +++ b/mingw64/share/doc/git-doc/git-commit-graph.html @@ -684,7 +684,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 0998cb59c08..cd787e48734 100644 --- a/mingw64/share/doc/git-doc/git-commit-tree.html +++ b/mingw64/share/doc/git-doc/git-commit-tree.html @@ -726,7 +726,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-commit.html b/mingw64/share/doc/git-doc/git-commit.html index ab097f61af7..6466cf7e2ff 100644 --- a/mingw64/share/doc/git-doc/git-commit.html +++ b/mingw64/share/doc/git-doc/git-commit.html @@ -1389,7 +1389,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-config.html b/mingw64/share/doc/git-doc/git-config.html index b83b3b1db50..09fc5e66372 100644 --- a/mingw64/share/doc/git-doc/git-config.html +++ b/mingw64/share/doc/git-doc/git-config.html @@ -8760,7 +8760,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-count-objects.html b/mingw64/share/doc/git-doc/git-count-objects.html index ce8a578c7bf..a5783c22345 100644 --- a/mingw64/share/doc/git-doc/git-count-objects.html +++ b/mingw64/share/doc/git-doc/git-count-objects.html @@ -522,7 +522,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 cf05feb6386..51d3a165b70 100644 --- a/mingw64/share/doc/git-doc/git-credential-cache--daemon.html +++ b/mingw64/share/doc/git-doc/git-credential-cache--daemon.html @@ -493,7 +493,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 e21102db08c..0e506231617 100644 --- a/mingw64/share/doc/git-doc/git-credential-cache.html +++ b/mingw64/share/doc/git-doc/git-credential-cache.html @@ -553,7 +553,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 9bba5c6c335..c76d986caf1 100644 --- a/mingw64/share/doc/git-doc/git-credential-store.html +++ b/mingw64/share/doc/git-doc/git-credential-store.html @@ -601,7 +601,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-credential.html b/mingw64/share/doc/git-doc/git-credential.html index bb5f68b3bee..5fac73b8281 100644 --- a/mingw64/share/doc/git-doc/git-credential.html +++ b/mingw64/share/doc/git-doc/git-credential.html @@ -689,7 +689,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cvsexportcommit.html b/mingw64/share/doc/git-doc/git-cvsexportcommit.html index 2eec9943881..d7fa6ca32de 100644 --- a/mingw64/share/doc/git-doc/git-cvsexportcommit.html +++ b/mingw64/share/doc/git-doc/git-cvsexportcommit.html @@ -611,7 +611,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cvsimport.html b/mingw64/share/doc/git-doc/git-cvsimport.html index 31fb64cf0ae..de0566b115b 100644 --- a/mingw64/share/doc/git-doc/git-cvsimport.html +++ b/mingw64/share/doc/git-doc/git-cvsimport.html @@ -760,7 +760,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-cvsserver.html b/mingw64/share/doc/git-doc/git-cvsserver.html index dcbd228a6c6..df9da591ca7 100644 --- a/mingw64/share/doc/git-doc/git-cvsserver.html +++ b/mingw64/share/doc/git-doc/git-cvsserver.html @@ -1037,7 +1037,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-daemon.html b/mingw64/share/doc/git-doc/git-daemon.html index b5094691fd4..87d6a0f5712 100644 --- a/mingw64/share/doc/git-doc/git-daemon.html +++ b/mingw64/share/doc/git-doc/git-daemon.html @@ -874,7 +874,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-describe.html b/mingw64/share/doc/git-doc/git-describe.html index 1cba36693db..11943d15a36 100644 --- a/mingw64/share/doc/git-doc/git-describe.html +++ b/mingw64/share/doc/git-doc/git-describe.html @@ -718,7 +718,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-diagnose.html b/mingw64/share/doc/git-doc/git-diagnose.html index 67a8939631a..7a855510d3f 100644 --- a/mingw64/share/doc/git-doc/git-diagnose.html +++ b/mingw64/share/doc/git-doc/git-diagnose.html @@ -545,7 +545,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 7482dad93e6..ad0d5b0a223 100644 --- a/mingw64/share/doc/git-doc/git-diff-files.html +++ b/mingw64/share/doc/git-doc/git-diff-files.html @@ -2011,7 +2011,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 9e72a3f67f3..89adafdd210 100644 --- a/mingw64/share/doc/git-doc/git-diff-index.html +++ b/mingw64/share/doc/git-doc/git-diff-index.html @@ -2142,7 +2142,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 2b42883cfa2..60057c67d29 100644 --- a/mingw64/share/doc/git-doc/git-diff-tree.html +++ b/mingw64/share/doc/git-doc/git-diff-tree.html @@ -2988,7 +2988,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-diff.html b/mingw64/share/doc/git-doc/git-diff.html index b3a4c07ae60..3bfe0ee664c 100644 --- a/mingw64/share/doc/git-doc/git-diff.html +++ b/mingw64/share/doc/git-doc/git-diff.html @@ -2685,7 +2685,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-difftool.html b/mingw64/share/doc/git-doc/git-difftool.html index 4f1a532eced..686f2e280c0 100644 --- a/mingw64/share/doc/git-doc/git-difftool.html +++ b/mingw64/share/doc/git-doc/git-difftool.html @@ -690,7 +690,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 4a3066ea3f5..a81c2e8bfe6 100644 --- a/mingw64/share/doc/git-doc/git-fast-export.html +++ b/mingw64/share/doc/git-doc/git-fast-export.html @@ -795,7 +795,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 d6265d1d59b..3560f7e76b9 100644 --- a/mingw64/share/doc/git-doc/git-fast-import.html +++ b/mingw64/share/doc/git-doc/git-fast-import.html @@ -2532,7 +2532,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 674dcb048c9..441b02df462 100644 --- a/mingw64/share/doc/git-doc/git-fetch-pack.html +++ b/mingw64/share/doc/git-doc/git-fetch-pack.html @@ -620,7 +620,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fetch.html b/mingw64/share/doc/git-doc/git-fetch.html index c63c8e5426f..8f36dd8c178 100644 --- a/mingw64/share/doc/git-doc/git-fetch.html +++ b/mingw64/share/doc/git-doc/git-fetch.html @@ -1808,7 +1808,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 61521215093..0c965ac1b0c 100644 --- a/mingw64/share/doc/git-doc/git-filter-branch.html +++ b/mingw64/share/doc/git-doc/git-filter-branch.html @@ -1316,7 +1316,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 45fcf71f8ab..9daca434aa3 100644 --- a/mingw64/share/doc/git-doc/git-fmt-merge-msg.html +++ b/mingw64/share/doc/git-doc/git-fmt-merge-msg.html @@ -587,7 +587,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 a1811fe3be0..4601edd354e 100644 --- a/mingw64/share/doc/git-doc/git-for-each-ref.html +++ b/mingw64/share/doc/git-doc/git-for-each-ref.html @@ -1077,7 +1077,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 cef534860b9..9fd78ed9b98 100644 --- a/mingw64/share/doc/git-doc/git-for-each-repo.html +++ b/mingw64/share/doc/git-doc/git-for-each-repo.html @@ -524,7 +524,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 4262a8472f6..9d9a336c19e 100644 --- a/mingw64/share/doc/git-doc/git-format-patch.html +++ b/mingw64/share/doc/git-doc/git-format-patch.html @@ -1964,7 +1964,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 73375024565..9aaf466972a 100644 --- a/mingw64/share/doc/git-doc/git-fsck-objects.html +++ b/mingw64/share/doc/git-doc/git-fsck-objects.html @@ -473,7 +473,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-fsck.html b/mingw64/share/doc/git-doc/git-fsck.html index 9586c667d1c..d07848ebdb2 100644 --- a/mingw64/share/doc/git-doc/git-fsck.html +++ b/mingw64/share/doc/git-doc/git-fsck.html @@ -1018,7 +1018,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 0aeaf6bcaf8..d9abba43605 100644 --- a/mingw64/share/doc/git-doc/git-fsmonitor--daemon.html +++ b/mingw64/share/doc/git-doc/git-fsmonitor--daemon.html @@ -603,7 +603,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-gc.html b/mingw64/share/doc/git-doc/git-gc.html index 3259f9867b6..256fafef6fc 100644 --- a/mingw64/share/doc/git-doc/git-gc.html +++ b/mingw64/share/doc/git-doc/git-gc.html @@ -884,7 +884,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 6240575de10..5d60b7ffdf5 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 @@ -481,7 +481,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-grep.html b/mingw64/share/doc/git-doc/git-grep.html index 15f1908e2c6..422e89bfc9d 100644 --- a/mingw64/share/doc/git-doc/git-grep.html +++ b/mingw64/share/doc/git-doc/git-grep.html @@ -920,7 +920,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-gui.html b/mingw64/share/doc/git-doc/git-gui.html index e8193cfc9d5..bb706b38cd1 100644 --- a/mingw64/share/doc/git-doc/git-gui.html +++ b/mingw64/share/doc/git-doc/git-gui.html @@ -609,7 +609,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 e9a20957570..6bdf3eefa51 100644 --- a/mingw64/share/doc/git-doc/git-hash-object.html +++ b/mingw64/share/doc/git-doc/git-hash-object.html @@ -530,7 +530,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-help.html b/mingw64/share/doc/git-doc/git-help.html index 9179554e060..8f34290400f 100644 --- a/mingw64/share/doc/git-doc/git-help.html +++ b/mingw64/share/doc/git-doc/git-help.html @@ -750,7 +750,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-hook.html b/mingw64/share/doc/git-doc/git-hook.html index f1381d17637..02d3c7cf5fc 100644 --- a/mingw64/share/doc/git-doc/git-hook.html +++ b/mingw64/share/doc/git-doc/git-hook.html @@ -521,7 +521,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 74a51082dd4..ca3a91e720e 100644 --- a/mingw64/share/doc/git-doc/git-http-backend.html +++ b/mingw64/share/doc/git-doc/git-http-backend.html @@ -827,7 +827,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 c6749b5f306..7aca82bde8f 100644 --- a/mingw64/share/doc/git-doc/git-http-fetch.html +++ b/mingw64/share/doc/git-doc/git-http-fetch.html @@ -534,7 +534,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 b8d7307510c..d44a7cb5c93 100644 --- a/mingw64/share/doc/git-doc/git-http-push.html +++ b/mingw64/share/doc/git-doc/git-http-push.html @@ -589,7 +589,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 daf5106c769..fd964f8abf4 100644 --- a/mingw64/share/doc/git-doc/git-imap-send.html +++ b/mingw64/share/doc/git-doc/git-imap-send.html @@ -720,7 +720,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 2ec8e43f7c9..1b836a72414 100644 --- a/mingw64/share/doc/git-doc/git-index-pack.html +++ b/mingw64/share/doc/git-doc/git-index-pack.html @@ -638,7 +638,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 758476cafb7..05534f2adc5 100644 --- a/mingw64/share/doc/git-doc/git-init-db.html +++ b/mingw64/share/doc/git-doc/git-init-db.html @@ -473,7 +473,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-init.html b/mingw64/share/doc/git-doc/git-init.html index 8e2c57c5a3d..4b1113d986f 100644 --- a/mingw64/share/doc/git-doc/git-init.html +++ b/mingw64/share/doc/git-doc/git-init.html @@ -713,7 +713,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-instaweb.html b/mingw64/share/doc/git-doc/git-instaweb.html index dbe33a2f9ab..234206ff6f0 100644 --- a/mingw64/share/doc/git-doc/git-instaweb.html +++ b/mingw64/share/doc/git-doc/git-instaweb.html @@ -569,7 +569,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 31e850c9dae..92c4ecd8b99 100644 --- a/mingw64/share/doc/git-doc/git-interpret-trailers.html +++ b/mingw64/share/doc/git-doc/git-interpret-trailers.html @@ -1077,7 +1077,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-log.html b/mingw64/share/doc/git-doc/git-log.html index 68002364497..899acb798b2 100644 --- a/mingw64/share/doc/git-doc/git-log.html +++ b/mingw64/share/doc/git-doc/git-log.html @@ -4403,7 +4403,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 50e7a261494..8cde96750a4 100644 --- a/mingw64/share/doc/git-doc/git-ls-files.html +++ b/mingw64/share/doc/git-doc/git-ls-files.html @@ -910,7 +910,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-ls-remote.html b/mingw64/share/doc/git-doc/git-ls-remote.html index 4f3c5965da8..eb31dec4ad2 100644 --- a/mingw64/share/doc/git-doc/git-ls-remote.html +++ b/mingw64/share/doc/git-doc/git-ls-remote.html @@ -642,7 +642,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 40a48b791cf..b8da861385a 100644 --- a/mingw64/share/doc/git-doc/git-ls-tree.html +++ b/mingw64/share/doc/git-doc/git-ls-tree.html @@ -678,7 +678,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mailinfo.html b/mingw64/share/doc/git-doc/git-mailinfo.html index 402fa0e45f9..a1b20ed7542 100644 --- a/mingw64/share/doc/git-doc/git-mailinfo.html +++ b/mingw64/share/doc/git-doc/git-mailinfo.html @@ -637,7 +637,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mailsplit.html b/mingw64/share/doc/git-doc/git-mailsplit.html index 12ddfb926c8..3ec845e4136 100644 --- a/mingw64/share/doc/git-doc/git-mailsplit.html +++ b/mingw64/share/doc/git-doc/git-mailsplit.html @@ -535,7 +535,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-maintenance.html b/mingw64/share/doc/git-doc/git-maintenance.html index c19587b9680..888c9f8735c 100644 --- a/mingw64/share/doc/git-doc/git-maintenance.html +++ b/mingw64/share/doc/git-doc/git-maintenance.html @@ -1041,7 +1041,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 7c07a9789ab..05c82966d91 100644 --- a/mingw64/share/doc/git-doc/git-merge-base.html +++ b/mingw64/share/doc/git-doc/git-merge-base.html @@ -760,7 +760,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 a2ffe5e9559..f3c1e61c30e 100644 --- a/mingw64/share/doc/git-doc/git-merge-file.html +++ b/mingw64/share/doc/git-doc/git-merge-file.html @@ -451,7 +451,7 @@

SYNOPSIS

git merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]]
         [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
-        [--[no-]diff3] <current-file> <base-file> <other-file>
+ [--[no-]diff3] [--object-id] <current> <base> <other>
@@ -459,15 +459,16 @@

SYNOPSIS

DESCRIPTION

-

git merge-file incorporates all changes that lead from the <base-file> -to <other-file> into <current-file>. The result ordinarily goes into -<current-file>. git merge-file is useful for combining separate changes -to an original. Suppose <base-file> is the original, and both -<current-file> and <other-file> are modifications of <base-file>, +

Given three files <current>, <base> and <other>, +git merge-file incorporates all changes that lead from <base> +to <other> into <current>. The result ordinarily goes into +<current>. git merge-file is useful for combining separate changes +to an original. Suppose <base> is the original, and both +<current> and <other> are modifications of <base>, then git merge-file combines both changes.

-

A conflict occurs if both <current-file> and <other-file> have changes +

A conflict occurs if both <current> and <other> have changes in a common segment of lines. If a conflict is found, git merge-file normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this:

@@ -484,11 +485,16 @@

DESCRIPTION

If there are conflicts, the user should edit the result and delete one of the alternatives. When --ours, --theirs, or --union option is in effect, -however, these conflicts are resolved favouring lines from <current-file>, -lines from <other-file>, or lines from both respectively. The length of the +however, these conflicts are resolved favouring lines from <current>, +lines from <other>, or lines from both respectively. The length of the conflict markers can be given with the --marker-size option.

+

If --object-id is specified, exactly the same behavior occurs, except that +instead of specifying what to merge as files, it is specified as a list of +object IDs referring to blobs.

+
+

The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts). If the merge was clean, the exit value is 0.

@@ -505,6 +511,16 @@

OPTIONS

+
--object-id
+
+

Specify the contents to merge as blobs in the current repository instead of +files. In this case, the operation must take place within a valid repository.

+
+

If the -p option is specified, the merged file (including conflicts, if any) +goes to standard output as normal; otherwise, the merged file is written to the +object store and the object ID of its blob is written to standard output.

+
+
-L <label>

This option may be given up to three times, and @@ -517,7 +533,7 @@

OPTIONS

-p

Send results to standard output instead of overwriting -<current-file>.

+<current>.

-q
@@ -557,6 +573,11 @@

EXAMPLES

merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels a and c instead of tmp/a123 and tmp/c345.

+
git merge-file -p --object-id abc1234 def567 890abcd
+
+

combines the changes of the blob abc1234 and 890abcd since def567, +tries to merge them and writes the result to standard output

+
@@ -572,7 +593,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge-file.txt b/mingw64/share/doc/git-doc/git-merge-file.txt index 7e9093fab60..6a081eacb72 100644 --- a/mingw64/share/doc/git-doc/git-merge-file.txt +++ b/mingw64/share/doc/git-doc/git-merge-file.txt @@ -11,19 +11,20 @@ SYNOPSIS [verse] 'git merge-file' [-L [-L [-L ]]] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=] - [--[no-]diff3] + [--[no-]diff3] [--object-id] DESCRIPTION ----------- -'git merge-file' incorporates all changes that lead from the `` -to `` into ``. The result ordinarily goes into -``. 'git merge-file' is useful for combining separate changes -to an original. Suppose `` is the original, and both -`` and `` are modifications of ``, +Given three files ``, `` and ``, +'git merge-file' incorporates all changes that lead from `` +to `` into ``. The result ordinarily goes into +``. 'git merge-file' is useful for combining separate changes +to an original. Suppose `` is the original, and both +`` and `` are modifications of ``, then 'git merge-file' combines both changes. -A conflict occurs if both `` and `` have changes +A conflict occurs if both `` and `` have changes in a common segment of lines. If a conflict is found, 'git merge-file' normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this: @@ -36,10 +37,14 @@ normally outputs a warning and brackets the conflict with lines containing If there are conflicts, the user should edit the result and delete one of the alternatives. When `--ours`, `--theirs`, or `--union` option is in effect, -however, these conflicts are resolved favouring lines from ``, -lines from ``, or lines from both respectively. The length of the +however, these conflicts are resolved favouring lines from ``, +lines from ``, or lines from both respectively. The length of the conflict markers can be given with the `--marker-size` option. +If `--object-id` is specified, exactly the same behavior occurs, except that +instead of specifying what to merge as files, it is specified as a list of +object IDs referring to blobs. + The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts). If the merge was clean, the exit value is 0. @@ -52,6 +57,14 @@ linkgit:git[1]. OPTIONS ------- +--object-id:: + Specify the contents to merge as blobs in the current repository instead of + files. In this case, the operation must take place within a valid repository. ++ +If the `-p` option is specified, the merged file (including conflicts, if any) +goes to standard output as normal; otherwise, the merged file is written to the +object store and the object ID of its blob is written to standard output. + -L
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 9fc34c6bfd1..91f82c73e17 100644 --- a/mingw64/share/doc/git-doc/git-merge-one-file.html +++ b/mingw64/share/doc/git-doc/git-merge-one-file.html @@ -473,7 +473,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 c62b9afd57e..a492e28345f 100644 --- a/mingw64/share/doc/git-doc/git-merge-tree.html +++ b/mingw64/share/doc/git-doc/git-merge-tree.html @@ -890,7 +890,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-merge.html b/mingw64/share/doc/git-doc/git-merge.html index da3e9ae369d..9b676882aed 100644 --- a/mingw64/share/doc/git-doc/git-merge.html +++ b/mingw64/share/doc/git-doc/git-merge.html @@ -1698,7 +1698,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 bea18872a57..683019b4487 100644 --- a/mingw64/share/doc/git-doc/git-mergetool--lib.html +++ b/mingw64/share/doc/git-doc/git-mergetool--lib.html @@ -519,7 +519,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mergetool.html b/mingw64/share/doc/git-doc/git-mergetool.html index c5352a23cf9..ff329c7fded 100644 --- a/mingw64/share/doc/git-doc/git-mergetool.html +++ b/mingw64/share/doc/git-doc/git-mergetool.html @@ -1009,7 +1009,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mktag.html b/mingw64/share/doc/git-doc/git-mktag.html index 78e77d72eac..e15200a5788 100644 --- a/mingw64/share/doc/git-doc/git-mktag.html +++ b/mingw64/share/doc/git-doc/git-mktag.html @@ -542,7 +542,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mktree.html b/mingw64/share/doc/git-doc/git-mktree.html index 6830ab32f25..267a67111b8 100644 --- a/mingw64/share/doc/git-doc/git-mktree.html +++ b/mingw64/share/doc/git-doc/git-mktree.html @@ -502,7 +502,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 7dc3fd40cc0..84d62b84d4f 100644 --- a/mingw64/share/doc/git-doc/git-multi-pack-index.html +++ b/mingw64/share/doc/git-doc/git-multi-pack-index.html @@ -636,7 +636,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-mv.html b/mingw64/share/doc/git-doc/git-mv.html index 072442bad50..d5d0e215492 100644 --- a/mingw64/share/doc/git-doc/git-mv.html +++ b/mingw64/share/doc/git-doc/git-mv.html @@ -547,7 +547,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 1fed00a0404..993a5e68b37 100644 --- a/mingw64/share/doc/git-doc/git-name-rev.html +++ b/mingw64/share/doc/git-doc/git-name-rev.html @@ -587,7 +587,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-notes.html b/mingw64/share/doc/git-doc/git-notes.html index 4758ac9d8c6..4d26ea55056 100644 --- a/mingw64/share/doc/git-doc/git-notes.html +++ b/mingw64/share/doc/git-doc/git-notes.html @@ -1007,7 +1007,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-p4.html b/mingw64/share/doc/git-doc/git-p4.html index 8ef4e120703..39bee4e642b 100644 --- a/mingw64/share/doc/git-doc/git-p4.html +++ b/mingw64/share/doc/git-doc/git-p4.html @@ -1511,7 +1511,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 4f47dc7d30f..8c0bc09caae 100644 --- a/mingw64/share/doc/git-doc/git-pack-objects.html +++ b/mingw64/share/doc/git-doc/git-pack-objects.html @@ -991,7 +991,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 b360859100f..8175efeb59e 100644 --- a/mingw64/share/doc/git-doc/git-pack-redundant.html +++ b/mingw64/share/doc/git-doc/git-pack-redundant.html @@ -535,7 +535,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 96257a184c6..a570c52a2e2 100644 --- a/mingw64/share/doc/git-doc/git-pack-refs.html +++ b/mingw64/share/doc/git-doc/git-pack-refs.html @@ -559,7 +559,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 47d4bf02117..a3f5ace1aee 100644 --- a/mingw64/share/doc/git-doc/git-patch-id.html +++ b/mingw64/share/doc/git-doc/git-patch-id.html @@ -551,7 +551,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 c7045ec652e..012891c697e 100644 --- a/mingw64/share/doc/git-doc/git-prune-packed.html +++ b/mingw64/share/doc/git-doc/git-prune-packed.html @@ -513,7 +513,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-prune.html b/mingw64/share/doc/git-doc/git-prune.html index f8772a195f0..e56190e6d43 100644 --- a/mingw64/share/doc/git-doc/git-prune.html +++ b/mingw64/share/doc/git-doc/git-prune.html @@ -574,7 +574,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-pull.html b/mingw64/share/doc/git-doc/git-pull.html index fa48e55911f..412941a698f 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 349ab8629bb..48ee5e31da2 100644 --- a/mingw64/share/doc/git-doc/git-push.html +++ b/mingw64/share/doc/git-doc/git-push.html @@ -1815,7 +1815,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-quiltimport.html b/mingw64/share/doc/git-doc/git-quiltimport.html index 4717864caa9..80cce8a0422 100644 --- a/mingw64/share/doc/git-doc/git-quiltimport.html +++ b/mingw64/share/doc/git-doc/git-quiltimport.html @@ -530,7 +530,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 e31810e5f0b..0d8e9930bbf 100644 --- a/mingw64/share/doc/git-doc/git-range-diff.html +++ b/mingw64/share/doc/git-doc/git-range-diff.html @@ -811,7 +811,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 cb0a96621d4..ed4679acd71 100644 --- a/mingw64/share/doc/git-doc/git-read-tree.html +++ b/mingw64/share/doc/git-doc/git-read-tree.html @@ -994,7 +994,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rebase.html b/mingw64/share/doc/git-doc/git-rebase.html index 18157c7f844..6b91e66af9b 100644 --- a/mingw64/share/doc/git-doc/git-rebase.html +++ b/mingw64/share/doc/git-doc/git-rebase.html @@ -821,7 +821,7 @@

OPTIONS

See also INCOMPATIBLE OPTIONS below.

-
--empty={drop,keep,ask}
+
--empty=(drop|keep|ask)

How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become @@ -1374,7 +1374,7 @@

Empty commits

Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend -also has an --empty={drop,keep,ask} option for changing the behavior +also has an --empty=(drop|keep|ask) option for changing the behavior of handling commits that become empty.

@@ -2449,7 +2449,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rebase.txt b/mingw64/share/doc/git-doc/git-rebase.txt index e7b39ad244a..b4526ca2461 100644 --- a/mingw64/share/doc/git-doc/git-rebase.txt +++ b/mingw64/share/doc/git-doc/git-rebase.txt @@ -289,7 +289,7 @@ See also INCOMPATIBLE OPTIONS below. + See also INCOMPATIBLE OPTIONS below. ---empty={drop,keep,ask}:: +--empty=(drop|keep|ask):: How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already @@ -695,7 +695,7 @@ be dropped automatically with `--no-keep-empty`). Similar to the apply backend, by default the merge backend drops commits that become empty unless `-i`/`--interactive` is specified (in which case it stops and asks the user what to do). The merge backend -also has an `--empty={drop,keep,ask}` option for changing the behavior +also has an `--empty=(drop|keep|ask)` option for changing the behavior of handling commits that become empty. Directory rename detection diff --git a/mingw64/share/doc/git-doc/git-receive-pack.html b/mingw64/share/doc/git-doc/git-receive-pack.html index d765d5e2b43..0c60b3cbcaf 100644 --- a/mingw64/share/doc/git-doc/git-receive-pack.html +++ b/mingw64/share/doc/git-doc/git-receive-pack.html @@ -806,7 +806,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-reflog.html b/mingw64/share/doc/git-doc/git-reflog.html index 8aef78b803d..c2ca935defa 100644 --- a/mingw64/share/doc/git-doc/git-reflog.html +++ b/mingw64/share/doc/git-doc/git-reflog.html @@ -608,7 +608,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 3409761a968..6c1573e5cc2 100644 --- a/mingw64/share/doc/git-doc/git-remote-ext.html +++ b/mingw64/share/doc/git-doc/git-remote-ext.html @@ -624,7 +624,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 99c8d82c692..05ad51759b9 100644 --- a/mingw64/share/doc/git-doc/git-remote-fd.html +++ b/mingw64/share/doc/git-doc/git-remote-fd.html @@ -539,7 +539,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 85d8b9884c7..f14c00dfb98 100644 --- a/mingw64/share/doc/git-doc/git-remote-helpers.html +++ b/mingw64/share/doc/git-doc/git-remote-helpers.html @@ -457,7 +457,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 ec0ad9f1266..12b03da90bf 100644 --- a/mingw64/share/doc/git-doc/git-remote.html +++ b/mingw64/share/doc/git-doc/git-remote.html @@ -774,7 +774,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-repack.html b/mingw64/share/doc/git-doc/git-repack.html index 97ae6ec0c24..7320a2349fe 100644 --- a/mingw64/share/doc/git-doc/git-repack.html +++ b/mingw64/share/doc/git-doc/git-repack.html @@ -780,7 +780,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-replace.html b/mingw64/share/doc/git-doc/git-replace.html index d28dca1b1f6..cc82ebcb02a 100644 --- a/mingw64/share/doc/git-doc/git-replace.html +++ b/mingw64/share/doc/git-doc/git-replace.html @@ -666,7 +666,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 a8713798bb5..59b1c480036 100644 --- a/mingw64/share/doc/git-doc/git-request-pull.html +++ b/mingw64/share/doc/git-doc/git-request-pull.html @@ -560,7 +560,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rerere.html b/mingw64/share/doc/git-doc/git-rerere.html index dd9bffe8ce6..55c70d2774b 100644 --- a/mingw64/share/doc/git-doc/git-rerere.html +++ b/mingw64/share/doc/git-doc/git-rerere.html @@ -710,7 +710,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-reset.html b/mingw64/share/doc/git-doc/git-reset.html index 1fb4fd36ba8..bd1eae2f156 100644 --- a/mingw64/share/doc/git-doc/git-reset.html +++ b/mingw64/share/doc/git-doc/git-reset.html @@ -1155,7 +1155,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-restore.html b/mingw64/share/doc/git-doc/git-restore.html index 53a42b2cfb3..3dd1148ac39 100644 --- a/mingw64/share/doc/git-doc/git-restore.html +++ b/mingw64/share/doc/git-doc/git-restore.html @@ -735,7 +735,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 6d3db0dad76..13792f8b0b3 100644 --- a/mingw64/share/doc/git-doc/git-rev-list.html +++ b/mingw64/share/doc/git-doc/git-rev-list.html @@ -2951,7 +2951,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 6acbf1edd97..253621c63d9 100644 --- a/mingw64/share/doc/git-doc/git-rev-parse.html +++ b/mingw64/share/doc/git-doc/git-rev-parse.html @@ -1621,7 +1621,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-revert.html b/mingw64/share/doc/git-doc/git-revert.html index cbc9d6615e2..b39e00ea9f7 100644 --- a/mingw64/share/doc/git-doc/git-revert.html +++ b/mingw64/share/doc/git-doc/git-revert.html @@ -703,7 +703,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-rm.html b/mingw64/share/doc/git-doc/git-rm.html index 078f44f3971..13cdd37ecd1 100644 --- a/mingw64/share/doc/git-doc/git-rm.html +++ b/mingw64/share/doc/git-doc/git-rm.html @@ -717,7 +717,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 8d853fc5fd0..0be4d724d6d 100644 --- a/mingw64/share/doc/git-doc/git-send-email.html +++ b/mingw64/share/doc/git-doc/git-send-email.html @@ -1285,7 +1285,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 c8ecf4f1b7d..30df8b9499a 100644 --- a/mingw64/share/doc/git-doc/git-send-pack.html +++ b/mingw64/share/doc/git-doc/git-send-pack.html @@ -653,7 +653,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 056bc186266..7e5862a6332 100644 --- a/mingw64/share/doc/git-doc/git-sh-i18n--envsubst.html +++ b/mingw64/share/doc/git-doc/git-sh-i18n--envsubst.html @@ -490,7 +490,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 82e5d8e0557..066bf33243a 100644 --- a/mingw64/share/doc/git-doc/git-sh-i18n.html +++ b/mingw64/share/doc/git-doc/git-sh-i18n.html @@ -504,7 +504,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 913c1de1aff..9ab34fd9a7c 100644 --- a/mingw64/share/doc/git-doc/git-sh-setup.html +++ b/mingw64/share/doc/git-doc/git-sh-setup.html @@ -568,7 +568,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-shell.html b/mingw64/share/doc/git-doc/git-shell.html index 6a7fc427fef..82d77903616 100644 --- a/mingw64/share/doc/git-doc/git-shell.html +++ b/mingw64/share/doc/git-doc/git-shell.html @@ -584,7 +584,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-shortlog.html b/mingw64/share/doc/git-doc/git-shortlog.html index 8711ddfb1e0..1148b76b7b7 100644 --- a/mingw64/share/doc/git-doc/git-shortlog.html +++ b/mingw64/share/doc/git-doc/git-shortlog.html @@ -1558,7 +1558,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 1dc8046414d..3b1692709b1 100644 --- a/mingw64/share/doc/git-doc/git-show-branch.html +++ b/mingw64/share/doc/git-doc/git-show-branch.html @@ -713,7 +713,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 3fe47c921f5..0c9e77574f2 100644 --- a/mingw64/share/doc/git-doc/git-show-index.html +++ b/mingw64/share/doc/git-doc/git-show-index.html @@ -529,7 +529,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 f0b553484a8..c47c18fc49d 100644 --- a/mingw64/share/doc/git-doc/git-show-ref.html +++ b/mingw64/share/doc/git-doc/git-show-ref.html @@ -449,10 +449,14 @@

NAME

SYNOPSIS

-
git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]
+
git show-ref [--head] [-d | --dereference]
              [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]
              [--heads] [--] [<pattern>…​]
-git show-ref --exclude-existing[=<pattern>]

+git show-ref --verify [-q | --quiet] [-d | --dereference]
+             [-s | --hash[=<n>]] [--abbrev[=<n>]]
+             [--] [<ref>…​]
+git show-ref --exclude-existing[=<pattern>]
+git show-ref --exists <ref>
@@ -474,6 +478,11 @@

DESCRIPTION

the local repository.

+

The --exists form can be used to check for the existence of a single +references. This form does not verify whether the reference resolves to an +actual object.

+
+

Use of this utility is encouraged in favor of directly accessing files under the .git directory.

@@ -513,6 +522,12 @@

OPTIONS

Aside from returning an error code of 1, it will also print an error message if --quiet was not specified.

+
--exists
+
+

Check whether the given reference exists. Returns an exit code of 0 if +it does, 2 if it is missing, and 1 in case looking up the reference +failed with an error other than the reference being missing.

+
--abbrev[=<n>]

Abbreviate the object name. When using --hash, you do @@ -521,8 +536,8 @@

OPTIONS

-q
--quiet
-

Do not print any results to stdout. When combined with --verify, this -can be used to silently check if a reference exists.

+

Do not print any results to stdout. Can be used with --verify to +silently check if a reference exists.

--exclude-existing[=<pattern>]
@@ -692,7 +707,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-show-ref.txt b/mingw64/share/doc/git-doc/git-show-ref.txt index 36e81b9dec4..ba757470059 100644 --- a/mingw64/share/doc/git-doc/git-show-ref.txt +++ b/mingw64/share/doc/git-doc/git-show-ref.txt @@ -8,10 +8,14 @@ git-show-ref - List references in a local repository SYNOPSIS -------- [verse] -'git show-ref' [-q | --quiet] [--verify] [--head] [-d | --dereference] +'git show-ref' [--head] [-d | --dereference] [-s | --hash[=]] [--abbrev[=]] [--tags] [--heads] [--] [...] +'git show-ref' --verify [-q | --quiet] [-d | --dereference] + [-s | --hash[=]] [--abbrev[=]] + [--] [...] 'git show-ref' --exclude-existing[=] +'git show-ref' --exists DESCRIPTION ----------- @@ -27,6 +31,10 @@ The `--exclude-existing` form is a filter that does the inverse. It reads refs from stdin, one ref per line, and shows those that don't exist in the local repository. +The `--exists` form can be used to check for the existence of a single +references. This form does not verify whether the reference resolves to an +actual object. + Use of this utility is encouraged in favor of directly accessing files under the `.git` directory. @@ -62,6 +70,12 @@ OPTIONS Aside from returning an error code of 1, it will also print an error message if `--quiet` was not specified. +--exists:: + + Check whether the given reference exists. Returns an exit code of 0 if + it does, 2 if it is missing, and 1 in case looking up the reference + failed with an error other than the reference being missing. + --abbrev[=]:: Abbreviate the object name. When using `--hash`, you do @@ -70,8 +84,8 @@ OPTIONS -q:: --quiet:: - Do not print any results to stdout. When combined with `--verify`, this - can be used to silently check if a reference exists. + Do not print any results to stdout. Can be used with `--verify` to + silently check if a reference exists. --exclude-existing[=]:: diff --git a/mingw64/share/doc/git-doc/git-show.html b/mingw64/share/doc/git-doc/git-show.html index 0a9faf6c1b3..bfb4b1d672d 100644 --- a/mingw64/share/doc/git-doc/git-show.html +++ b/mingw64/share/doc/git-doc/git-show.html @@ -2815,7 +2815,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 3b3b57a7a5c..1e59dc057cc 100644 --- a/mingw64/share/doc/git-doc/git-sparse-checkout.html +++ b/mingw64/share/doc/git-doc/git-sparse-checkout.html @@ -1042,7 +1042,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-stage.html b/mingw64/share/doc/git-doc/git-stage.html index 5bed4eaaf54..63d9b07b9f4 100644 --- a/mingw64/share/doc/git-doc/git-stage.html +++ b/mingw64/share/doc/git-doc/git-stage.html @@ -473,7 +473,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-stash.html b/mingw64/share/doc/git-doc/git-stash.html index bad68ad4cf6..617ca2b23f8 100644 --- a/mingw64/share/doc/git-doc/git-stash.html +++ b/mingw64/share/doc/git-doc/git-stash.html @@ -956,7 +956,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-status.html b/mingw64/share/doc/git-doc/git-status.html index fae82efefcd..4678eda1b3d 100644 --- a/mingw64/share/doc/git-doc/git-status.html +++ b/mingw64/share/doc/git-doc/git-status.html @@ -1155,7 +1155,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-stripspace.html b/mingw64/share/doc/git-doc/git-stripspace.html index 837996ff732..d8c7fad0985 100644 --- a/mingw64/share/doc/git-doc/git-stripspace.html +++ b/mingw64/share/doc/git-doc/git-stripspace.html @@ -576,7 +576,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-submodule.html b/mingw64/share/doc/git-doc/git-submodule.html index 63d13eafcad..a82087e9d54 100644 --- a/mingw64/share/doc/git-doc/git-submodule.html +++ b/mingw64/share/doc/git-doc/git-submodule.html @@ -1029,7 +1029,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-subtree.html b/mingw64/share/doc/git-doc/git-subtree.html index fe9d7273d8d..523bf64d84c 100644 --- a/mingw64/share/doc/git-doc/git-subtree.html +++ b/mingw64/share/doc/git-doc/git-subtree.html @@ -943,7 +943,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-svn.html b/mingw64/share/doc/git-doc/git-svn.html index 3db148a0590..5f4d99a90d5 100644 --- a/mingw64/share/doc/git-doc/git-svn.html +++ b/mingw64/share/doc/git-doc/git-svn.html @@ -1975,7 +1975,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-switch.html b/mingw64/share/doc/git-doc/git-switch.html index afc14df58c6..842a0e0d7e2 100644 --- a/mingw64/share/doc/git-doc/git-switch.html +++ b/mingw64/share/doc/git-doc/git-switch.html @@ -856,7 +856,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 5d41f2cb3bb..5af9a108125 100644 --- a/mingw64/share/doc/git-doc/git-symbolic-ref.html +++ b/mingw64/share/doc/git-doc/git-symbolic-ref.html @@ -550,7 +550,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-tag.html b/mingw64/share/doc/git-doc/git-tag.html index 6da77969663..1ee0a8f4aed 100644 --- a/mingw64/share/doc/git-doc/git-tag.html +++ b/mingw64/share/doc/git-doc/git-tag.html @@ -999,7 +999,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-tools.html b/mingw64/share/doc/git-doc/git-tools.html index 7488c72b3ad..fbf965d03e1 100644 --- a/mingw64/share/doc/git-doc/git-tools.html +++ b/mingw64/share/doc/git-doc/git-tools.html @@ -457,7 +457,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 19b12a39965..2592631108c 100644 --- a/mingw64/share/doc/git-doc/git-unpack-file.html +++ b/mingw64/share/doc/git-doc/git-unpack-file.html @@ -487,7 +487,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 4b3db2fc0a3..c89e51f25f1 100644 --- a/mingw64/share/doc/git-doc/git-unpack-objects.html +++ b/mingw64/share/doc/git-doc/git-unpack-objects.html @@ -517,7 +517,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 0ed946c2138..f41f001af49 100644 --- a/mingw64/share/doc/git-doc/git-update-index.html +++ b/mingw64/share/doc/git-doc/git-update-index.html @@ -1223,7 +1223,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 a07a83f9358..6ea9deea933 100644 --- a/mingw64/share/doc/git-doc/git-update-ref.html +++ b/mingw64/share/doc/git-doc/git-update-ref.html @@ -687,7 +687,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 1ce54ffbc92..03c2e8c8c59 100644 --- a/mingw64/share/doc/git-doc/git-update-server-info.html +++ b/mingw64/share/doc/git-doc/git-update-server-info.html @@ -510,7 +510,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 3c4a30c618a..944a319e59e 100644 --- a/mingw64/share/doc/git-doc/git-upload-archive.html +++ b/mingw64/share/doc/git-doc/git-upload-archive.html @@ -535,7 +535,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 84952e3a130..27611e6719b 100644 --- a/mingw64/share/doc/git-doc/git-upload-pack.html +++ b/mingw64/share/doc/git-doc/git-upload-pack.html @@ -539,7 +539,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-var.html b/mingw64/share/doc/git-doc/git-var.html index 88996cdc43d..9893c199f89 100644 --- a/mingw64/share/doc/git-doc/git-var.html +++ b/mingw64/share/doc/git-doc/git-var.html @@ -588,7 +588,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 d41cebcb9f2..fc7df6d80a4 100644 --- a/mingw64/share/doc/git-doc/git-verify-commit.html +++ b/mingw64/share/doc/git-doc/git-verify-commit.html @@ -495,7 +495,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 0fa75692fb7..c3dfb1ac0d6 100644 --- a/mingw64/share/doc/git-doc/git-verify-pack.html +++ b/mingw64/share/doc/git-doc/git-verify-pack.html @@ -527,7 +527,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 2646bd463a2..b6209ac8250 100644 --- a/mingw64/share/doc/git-doc/git-verify-tag.html +++ b/mingw64/share/doc/git-doc/git-verify-tag.html @@ -495,7 +495,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-version.html b/mingw64/share/doc/git-doc/git-version.html index a41896f983e..d2959e5b328 100644 --- a/mingw64/share/doc/git-doc/git-version.html +++ b/mingw64/share/doc/git-doc/git-version.html @@ -490,7 +490,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 307775a42ca..747854b00b7 100644 --- a/mingw64/share/doc/git-doc/git-web--browse.html +++ b/mingw64/share/doc/git-doc/git-web--browse.html @@ -639,7 +639,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-whatchanged.html b/mingw64/share/doc/git-doc/git-whatchanged.html index 70106675b3f..406e0e622ab 100644 --- a/mingw64/share/doc/git-doc/git-whatchanged.html +++ b/mingw64/share/doc/git-doc/git-whatchanged.html @@ -502,7 +502,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git-worktree.html b/mingw64/share/doc/git-doc/git-worktree.html index 62135d04c06..a92ea6ca66e 100644 --- a/mingw64/share/doc/git-doc/git-worktree.html +++ b/mingw64/share/doc/git-doc/git-worktree.html @@ -1084,7 +1084,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 34ffd56db00..1eba3c2e082 100644 --- a/mingw64/share/doc/git-doc/git-write-tree.html +++ b/mingw64/share/doc/git-doc/git-write-tree.html @@ -504,7 +504,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git.html b/mingw64/share/doc/git-doc/git.html index 0f955284763..3c38ef465e0 100644 --- a/mingw64/share/doc/git-doc/git.html +++ b/mingw64/share/doc/git-doc/git.html @@ -2342,6 +2342,18 @@

other

should not normally need to set this to 0, but it may be useful when trying to salvage data from a corrupted repository.

+
GIT_COMMIT_GRAPH_PARANOIA
+
+

When loading a commit object from the commit-graph, Git performs an +existence check on the object in the object database. This is done to +avoid issues with stale commit-graphs that contain references to +already-deleted commits, but comes with a performance penalty.

+
+

The default is "true", which enables the aforementioned behavior. +Setting this to "false" disables the existence check. This can lead to +a performance improvement at the cost of consistency.

+
+
GIT_ALLOW_PROTOCOL

If set to a colon-separated list of protocols, behave as if @@ -2575,7 +2587,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/git.txt b/mingw64/share/doc/git-doc/git.txt index ce057bc26dd..b35e1f9ce08 100644 --- a/mingw64/share/doc/git-doc/git.txt +++ b/mingw64/share/doc/git-doc/git.txt @@ -919,6 +919,16 @@ for full details. should not normally need to set this to `0`, but it may be useful when trying to salvage data from a corrupted repository. +`GIT_COMMIT_GRAPH_PARANOIA`:: + When loading a commit object from the commit-graph, Git performs an + existence check on the object in the object database. This is done to + avoid issues with stale commit-graphs that contain references to + already-deleted commits, but comes with a performance penalty. ++ +The default is "true", which enables the aforementioned behavior. +Setting this to "false" disables the existence check. This can lead to +a performance improvement at the cost of consistency. + `GIT_ALLOW_PROTOCOL`:: If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed diff --git a/mingw64/share/doc/git-doc/gitattributes.html b/mingw64/share/doc/git-doc/gitattributes.html index 6d309f64101..3ae9f503dc7 100644 --- a/mingw64/share/doc/git-doc/gitattributes.html +++ b/mingw64/share/doc/git-doc/gitattributes.html @@ -2131,7 +2131,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcli.html b/mingw64/share/doc/git-doc/gitcli.html index 8150cc6150f..d264adda48d 100644 --- a/mingw64/share/doc/git-doc/gitcli.html +++ b/mingw64/share/doc/git-doc/gitcli.html @@ -762,7 +762,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcore-tutorial.html b/mingw64/share/doc/git-doc/gitcore-tutorial.html index 59c2a03e86b..b8f81685936 100644 --- a/mingw64/share/doc/git-doc/gitcore-tutorial.html +++ b/mingw64/share/doc/git-doc/gitcore-tutorial.html @@ -2630,7 +2630,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcredentials.html b/mingw64/share/doc/git-doc/gitcredentials.html index 7781d5a1683..5f7edc24f33 100644 --- a/mingw64/share/doc/git-doc/gitcredentials.html +++ b/mingw64/share/doc/git-doc/gitcredentials.html @@ -856,7 +856,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitcvs-migration.html b/mingw64/share/doc/git-doc/gitcvs-migration.html index 6e52975d906..a355ecb56b4 100644 --- a/mingw64/share/doc/git-doc/gitcvs-migration.html +++ b/mingw64/share/doc/git-doc/gitcvs-migration.html @@ -725,7 +725,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitdiffcore.html b/mingw64/share/doc/git-doc/gitdiffcore.html index 91202ba7623..d0158656807 100644 --- a/mingw64/share/doc/git-doc/gitdiffcore.html +++ b/mingw64/share/doc/git-doc/gitdiffcore.html @@ -864,7 +864,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/giteveryday.html b/mingw64/share/doc/git-doc/giteveryday.html index 025c4791450..84dda3af8d5 100644 --- a/mingw64/share/doc/git-doc/giteveryday.html +++ b/mingw64/share/doc/git-doc/giteveryday.html @@ -1136,7 +1136,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitfaq.html b/mingw64/share/doc/git-doc/gitfaq.html index be70e6d06ba..ab266b5d4e5 100644 --- a/mingw64/share/doc/git-doc/gitfaq.html +++ b/mingw64/share/doc/git-doc/gitfaq.html @@ -1026,7 +1026,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-bundle.html b/mingw64/share/doc/git-doc/gitformat-bundle.html index bd9429b5c69..ba64d5fcc74 100644 --- a/mingw64/share/doc/git-doc/gitformat-bundle.html +++ b/mingw64/share/doc/git-doc/gitformat-bundle.html @@ -590,7 +590,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-chunk.html b/mingw64/share/doc/git-doc/gitformat-chunk.html index 26eb1a52944..37925c2af18 100644 --- a/mingw64/share/doc/git-doc/gitformat-chunk.html +++ b/mingw64/share/doc/git-doc/gitformat-chunk.html @@ -623,7 +623,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 4179a22fa6d..db0173e5057 100644 --- a/mingw64/share/doc/git-doc/gitformat-commit-graph.html +++ b/mingw64/share/doc/git-doc/gitformat-commit-graph.html @@ -768,7 +768,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-index.html b/mingw64/share/doc/git-doc/gitformat-index.html index e07fba94ed5..6c59838b427 100644 --- a/mingw64/share/doc/git-doc/gitformat-index.html +++ b/mingw64/share/doc/git-doc/gitformat-index.html @@ -1190,7 +1190,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-pack.html b/mingw64/share/doc/git-doc/gitformat-pack.html index b96f4234fd3..e9936ba6294 100644 --- a/mingw64/share/doc/git-doc/gitformat-pack.html +++ b/mingw64/share/doc/git-doc/gitformat-pack.html @@ -1042,10 +1042,11 @@

multi-pack-index 
Packfile Names (ID: {'P', 'N', 'A', 'M'})
-    Stores the packfile names as concatenated, null-terminated strings.
-    Packfiles must be listed in lexicographic order for fast lookups by
-    name. This is the only chunk not guaranteed to be a multiple of four
-    bytes in length, so should be the last chunk for alignment reasons.
+ Store the names of packfiles as a sequence of NUL-terminated + strings. There is no extra padding between the filenames, + and they are listed in lexicographic order. The chunk itself + is padded at the end with between 0 and 3 NUL bytes to make the + chunk size a multiple of 4 bytes.
@@ -1340,7 +1341,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitformat-pack.txt b/mingw64/share/doc/git-doc/gitformat-pack.txt index 4a4d87e7dbf..9fcb29a9c84 100644 --- a/mingw64/share/doc/git-doc/gitformat-pack.txt +++ b/mingw64/share/doc/git-doc/gitformat-pack.txt @@ -390,10 +390,11 @@ CHUNK LOOKUP: CHUNK DATA: Packfile Names (ID: {'P', 'N', 'A', 'M'}) - Stores the packfile names as concatenated, null-terminated strings. - Packfiles must be listed in lexicographic order for fast lookups by - name. This is the only chunk not guaranteed to be a multiple of four - bytes in length, so should be the last chunk for alignment reasons. + Store the names of packfiles as a sequence of NUL-terminated + strings. There is no extra padding between the filenames, + and they are listed in lexicographic order. The chunk itself + is padded at the end with between 0 and 3 NUL bytes to make the + chunk size a multiple of 4 bytes. OID Fanout (ID: {'O', 'I', 'D', 'F'}) The ith entry, F[i], stores the number of OIDs with first diff --git a/mingw64/share/doc/git-doc/gitformat-signature.html b/mingw64/share/doc/git-doc/gitformat-signature.html index eccffd313cc..c966eeb16d1 100644 --- a/mingw64/share/doc/git-doc/gitformat-signature.html +++ b/mingw64/share/doc/git-doc/gitformat-signature.html @@ -753,7 +753,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitglossary.html b/mingw64/share/doc/git-doc/gitglossary.html index 50ee94b7368..0c8a75b8ff1 100644 --- a/mingw64/share/doc/git-doc/gitglossary.html +++ b/mingw64/share/doc/git-doc/gitglossary.html @@ -1327,7 +1327,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/githooks.html b/mingw64/share/doc/git-doc/githooks.html index fda457d3547..329c1b043c0 100644 --- a/mingw64/share/doc/git-doc/githooks.html +++ b/mingw64/share/doc/git-doc/githooks.html @@ -1388,7 +1388,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitignore.html b/mingw64/share/doc/git-doc/gitignore.html index cf34e6535e9..6669f022c9b 100644 --- a/mingw64/share/doc/git-doc/gitignore.html +++ b/mingw64/share/doc/git-doc/gitignore.html @@ -766,7 +766,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitk.html b/mingw64/share/doc/git-doc/gitk.html index ae6fb4a8930..2d42a401b68 100644 --- a/mingw64/share/doc/git-doc/gitk.html +++ b/mingw64/share/doc/git-doc/gitk.html @@ -745,7 +745,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitmailmap.html b/mingw64/share/doc/git-doc/gitmailmap.html index b584865ca62..684853b1883 100644 --- a/mingw64/share/doc/git-doc/gitmailmap.html +++ b/mingw64/share/doc/git-doc/gitmailmap.html @@ -639,7 +639,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitmodules.html b/mingw64/share/doc/git-doc/gitmodules.html index dff035c44ea..b2f41969846 100644 --- a/mingw64/share/doc/git-doc/gitmodules.html +++ b/mingw64/share/doc/git-doc/gitmodules.html @@ -632,7 +632,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitnamespaces.html b/mingw64/share/doc/git-doc/gitnamespaces.html index 525ae299bed..787cc60108e 100644 --- a/mingw64/share/doc/git-doc/gitnamespaces.html +++ b/mingw64/share/doc/git-doc/gitnamespaces.html @@ -566,7 +566,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-capabilities.html b/mingw64/share/doc/git-doc/gitprotocol-capabilities.html index 71e44389c88..02dc391dca7 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-capabilities.html +++ b/mingw64/share/doc/git-doc/gitprotocol-capabilities.html @@ -973,7 +973,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-common.html b/mingw64/share/doc/git-doc/gitprotocol-common.html index 82cab670ad2..a542c68c712 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-common.html +++ b/mingw64/share/doc/git-doc/gitprotocol-common.html @@ -602,7 +602,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-http.html b/mingw64/share/doc/git-doc/gitprotocol-http.html index d6f135c58f7..05671eb81ca 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-http.html +++ b/mingw64/share/doc/git-doc/gitprotocol-http.html @@ -1201,7 +1201,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-pack.html b/mingw64/share/doc/git-doc/gitprotocol-pack.html index b22111dbf09..f48e36a6f25 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-pack.html +++ b/mingw64/share/doc/git-doc/gitprotocol-pack.html @@ -1355,7 +1355,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitprotocol-v2.html b/mingw64/share/doc/git-doc/gitprotocol-v2.html index 264a8846733..de35166b33e 100644 --- a/mingw64/share/doc/git-doc/gitprotocol-v2.html +++ b/mingw64/share/doc/git-doc/gitprotocol-v2.html @@ -1521,7 +1521,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitremote-helpers.html b/mingw64/share/doc/git-doc/gitremote-helpers.html index c557f569b34..0c6409c7b7d 100644 --- a/mingw64/share/doc/git-doc/gitremote-helpers.html +++ b/mingw64/share/doc/git-doc/gitremote-helpers.html @@ -1173,7 +1173,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitrepository-layout.html b/mingw64/share/doc/git-doc/gitrepository-layout.html index cfee91537df..4aa4ced0324 100644 --- a/mingw64/share/doc/git-doc/gitrepository-layout.html +++ b/mingw64/share/doc/git-doc/gitrepository-layout.html @@ -962,7 +962,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitrevisions.html b/mingw64/share/doc/git-doc/gitrevisions.html index d453d46f6e4..1a990ee0058 100644 --- a/mingw64/share/doc/git-doc/gitrevisions.html +++ b/mingw64/share/doc/git-doc/gitrevisions.html @@ -1034,7 +1034,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitsubmodules.html b/mingw64/share/doc/git-doc/gitsubmodules.html index 0ed68363d3d..ed8026f7b42 100644 --- a/mingw64/share/doc/git-doc/gitsubmodules.html +++ b/mingw64/share/doc/git-doc/gitsubmodules.html @@ -864,7 +864,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gittutorial-2.html b/mingw64/share/doc/git-doc/gittutorial-2.html index 48c5cbac421..97d327b1a7a 100644 --- a/mingw64/share/doc/git-doc/gittutorial-2.html +++ b/mingw64/share/doc/git-doc/gittutorial-2.html @@ -975,7 +975,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gittutorial.html b/mingw64/share/doc/git-doc/gittutorial.html index 3fceeecf1a3..3894df3c527 100644 --- a/mingw64/share/doc/git-doc/gittutorial.html +++ b/mingw64/share/doc/git-doc/gittutorial.html @@ -1312,7 +1312,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitweb.conf.html b/mingw64/share/doc/git-doc/gitweb.conf.html index 8d35a38ee8b..266d0eea3d2 100644 --- a/mingw64/share/doc/git-doc/gitweb.conf.html +++ b/mingw64/share/doc/git-doc/gitweb.conf.html @@ -1693,7 +1693,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitweb.html b/mingw64/share/doc/git-doc/gitweb.html index b9655c8c6bc..4ba286ad279 100644 --- a/mingw64/share/doc/git-doc/gitweb.html +++ b/mingw64/share/doc/git-doc/gitweb.html @@ -1376,7 +1376,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/gitworkflows.html b/mingw64/share/doc/git-doc/gitworkflows.html index 5c0b69183b5..d2f540c281b 100644 --- a/mingw64/share/doc/git-doc/gitworkflows.html +++ b/mingw64/share/doc/git-doc/gitworkflows.html @@ -1064,7 +1064,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/howto-index.html b/mingw64/share/doc/git-doc/howto-index.html index 186d5f3afe6..2a8a63147a5 100644 --- a/mingw64/share/doc/git-doc/howto-index.html +++ b/mingw64/share/doc/git-doc/howto-index.html @@ -622,7 +622,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 760384912b7..2f824d622b9 100644 --- a/mingw64/share/doc/git-doc/howto/coordinate-embargoed-releases.html +++ b/mingw64/share/doc/git-doc/howto/coordinate-embargoed-releases.html @@ -733,7 +733,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 1bcdff149a0..d741ef05277 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 @@ -703,7 +703,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 97526269cec..f71cb392e22 100644 --- a/mingw64/share/doc/git-doc/howto/maintain-git.html +++ b/mingw64/share/doc/git-doc/howto/maintain-git.html @@ -1176,7 +1176,7 @@

Preparing a "merge-fix"

diff --git a/mingw64/share/doc/git-doc/howto/new-command.html b/mingw64/share/doc/git-doc/howto/new-command.html index abe57b8e130..425de83affb 100644 --- a/mingw64/share/doc/git-doc/howto/new-command.html +++ b/mingw64/share/doc/git-doc/howto/new-command.html @@ -582,7 +582,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 fc7f8552a47..233eac410bd 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 @@ -654,7 +654,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 abcb167bae9..cdf76507e46 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 @@ -561,7 +561,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 df173aeb5c4..e0113c2561b 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 @@ -639,7 +639,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 cb01ef2edf5..90bbd5e0948 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 @@ -965,7 +965,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 58c863f4269..64a4f2424aa 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 @@ -827,7 +827,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 af69a3b31ca..df605eb829f 100644 --- a/mingw64/share/doc/git-doc/howto/revert-branch-rebase.html +++ b/mingw64/share/doc/git-doc/howto/revert-branch-rebase.html @@ -647,7 +647,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 82a86bc2aa8..ee37622a42c 100644 --- a/mingw64/share/doc/git-doc/howto/separating-topic-branches.html +++ b/mingw64/share/doc/git-doc/howto/separating-topic-branches.html @@ -566,7 +566,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 16dc01ee37e..7a6927315a7 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 @@ -880,7 +880,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 5687cb98e42..3ac12ca1407 100644 --- a/mingw64/share/doc/git-doc/howto/update-hook-example.html +++ b/mingw64/share/doc/git-doc/howto/update-hook-example.html @@ -646,7 +646,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 90aa7d5af20..56d29e2ba6e 100644 --- a/mingw64/share/doc/git-doc/howto/use-git-daemon.html +++ b/mingw64/share/doc/git-doc/howto/use-git-daemon.html @@ -522,7 +522,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 35c54b6ac18..be5d6ac7b26 100644 --- a/mingw64/share/doc/git-doc/howto/using-merge-subtree.html +++ b/mingw64/share/doc/git-doc/howto/using-merge-subtree.html @@ -552,7 +552,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 98492b3c1ca..6edbd0e1ce0 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 @@ -710,7 +710,7 @@

Auditors

diff --git a/mingw64/share/doc/git-doc/index.html b/mingw64/share/doc/git-doc/index.html index 0f955284763..3c38ef465e0 100644 --- a/mingw64/share/doc/git-doc/index.html +++ b/mingw64/share/doc/git-doc/index.html @@ -2342,6 +2342,18 @@

other

should not normally need to set this to 0, but it may be useful when trying to salvage data from a corrupted repository.

+
GIT_COMMIT_GRAPH_PARANOIA
+
+

When loading a commit object from the commit-graph, Git performs an +existence check on the object in the object database. This is done to +avoid issues with stale commit-graphs that contain references to +already-deleted commits, but comes with a performance penalty.

+
+

The default is "true", which enables the aforementioned behavior. +Setting this to "false" disables the existence check. This can lead to +a performance improvement at the cost of consistency.

+
+
GIT_ALLOW_PROTOCOL

If set to a colon-separated list of protocols, behave as if @@ -2575,7 +2587,7 @@

GIT

diff --git a/mingw64/share/doc/git-doc/scalar.html b/mingw64/share/doc/git-doc/scalar.html index f1dcde36266..81a2cd2e74f 100644 --- a/mingw64/share/doc/git-doc/scalar.html +++ b/mingw64/share/doc/git-doc/scalar.html @@ -686,7 +686,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 37770c6737c..58047899929 100644 --- a/mingw64/share/doc/git-doc/technical/api-error-handling.html +++ b/mingw64/share/doc/git-doc/technical/api-error-handling.html @@ -596,7 +596,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 7c2c71c916a..e72f454042f 100644 --- a/mingw64/share/doc/git-doc/technical/api-index.html +++ b/mingw64/share/doc/git-doc/technical/api-index.html @@ -470,7 +470,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 e10412e5dbe..8459603d0fc 100644 --- a/mingw64/share/doc/git-doc/technical/api-merge.html +++ b/mingw64/share/doc/git-doc/technical/api-merge.html @@ -510,7 +510,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 8a66a59e291..79d30b7d80e 100644 --- a/mingw64/share/doc/git-doc/technical/api-parse-options.html +++ b/mingw64/share/doc/git-doc/technical/api-parse-options.html @@ -928,7 +928,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 0fda727b65f..08e72866d62 100644 --- a/mingw64/share/doc/git-doc/technical/api-simple-ipc.html +++ b/mingw64/share/doc/git-doc/technical/api-simple-ipc.html @@ -571,7 +571,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 1a2bd4f1895..09252bf9e62 100644 --- a/mingw64/share/doc/git-doc/technical/api-trace2.html +++ b/mingw64/share/doc/git-doc/technical/api-trace2.html @@ -2054,7 +2054,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 43454ed04e9..dfc3f6db618 100644 --- a/mingw64/share/doc/git-doc/technical/bitmap-format.html +++ b/mingw64/share/doc/git-doc/technical/bitmap-format.html @@ -907,7 +907,7 @@

Commit lookup table

diff --git a/mingw64/share/doc/git-doc/technical/bundle-uri.html b/mingw64/share/doc/git-doc/technical/bundle-uri.html index 14443189900..49e7c855a85 100644 --- a/mingw64/share/doc/git-doc/technical/bundle-uri.html +++ b/mingw64/share/doc/git-doc/technical/bundle-uri.html @@ -1223,7 +1223,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 1d043f1a04c..fbe96de313e 100644 --- a/mingw64/share/doc/git-doc/technical/hash-function-transition.html +++ b/mingw64/share/doc/git-doc/technical/hash-function-transition.html @@ -1810,7 +1810,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 f2ab8fdafd7..f3de3ed16bc 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 @@ -509,7 +509,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 bb14e2cd5a1..a4e44131fae 100644 --- a/mingw64/share/doc/git-doc/technical/multi-pack-index.html +++ b/mingw64/share/doc/git-doc/technical/multi-pack-index.html @@ -605,7 +605,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 06ab304611f..f4431048045 100644 --- a/mingw64/share/doc/git-doc/technical/pack-heuristics.html +++ b/mingw64/share/doc/git-doc/technical/pack-heuristics.html @@ -1215,7 +1215,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 20cca4883a1..718ed1c16af 100644 --- a/mingw64/share/doc/git-doc/technical/parallel-checkout.html +++ b/mingw64/share/doc/git-doc/technical/parallel-checkout.html @@ -803,7 +803,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 434558201ef..f15ea377a94 100644 --- a/mingw64/share/doc/git-doc/technical/partial-clone.html +++ b/mingw64/share/doc/git-doc/technical/partial-clone.html @@ -952,7 +952,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 7a7d3c55851..af7bf5cf3b3 100644 --- a/mingw64/share/doc/git-doc/technical/racy-git.html +++ b/mingw64/share/doc/git-doc/technical/racy-git.html @@ -695,7 +695,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 1ac8e2d5d42..af3c7fff4c6 100644 --- a/mingw64/share/doc/git-doc/technical/reftable.html +++ b/mingw64/share/doc/git-doc/technical/reftable.html @@ -1996,7 +1996,7 @@

LMDB

diff --git a/mingw64/share/doc/git-doc/technical/scalar.html b/mingw64/share/doc/git-doc/technical/scalar.html index 8b358151a7a..73828cf314f 100644 --- a/mingw64/share/doc/git-doc/technical/scalar.html +++ b/mingw64/share/doc/git-doc/technical/scalar.html @@ -544,7 +544,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 98ffb200f95..3998f06bbad 100644 --- a/mingw64/share/doc/git-doc/technical/send-pack-pipeline.html +++ b/mingw64/share/doc/git-doc/technical/send-pack-pipeline.html @@ -533,7 +533,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 078f99b2a58..b8a5a506f9c 100644 --- a/mingw64/share/doc/git-doc/technical/shallow.html +++ b/mingw64/share/doc/git-doc/technical/shallow.html @@ -525,7 +525,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 670657eaed0..47092d6da0b 100644 --- a/mingw64/share/doc/git-doc/technical/trivial-merge.html +++ b/mingw64/share/doc/git-doc/technical/trivial-merge.html @@ -606,7 +606,7 @@

Three-way merge

diff --git a/mingw64/share/git/compat-bash.exe b/mingw64/share/git/compat-bash.exe index fac20f79ed4..27de6ebf02e 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 d4fcaf167ee..924c91f5714 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 fffd42b0210..fe7bb6c4b85 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 acaaa391bc3..6033b887648 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.43.0.rc0.windows.1"; +our $version = "2.43.0.rc1.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.43.0.rc0.windows.1-2/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/mtree deleted file mode 100644 index 7fdfec1dba6..00000000000 Binary files a/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/mtree and /dev/null differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/desc similarity index 92% rename from var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/desc rename to var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/desc index e4b21620f68..f63155f3914 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/desc @@ -2,7 +2,7 @@ mingw-w64-x86_64-git %VERSION% -2.43.0.rc0.windows.1-2 +2.43.0.rc1.windows.1-2 %BASE% mingw-w64-git @@ -17,16 +17,16 @@ https://git-for-windows.github.io/ any %BUILDDATE% -1698998646 +1699470980 %INSTALLDATE% -1699066803 +1699498770 %PACKAGER% gitforwindowshelper[bot] %SIZE% -52214745 +52236521 %LICENSE% GPL2 diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/files b/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/files similarity index 100% rename from var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/files rename to var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/files diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/install b/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/install similarity index 100% rename from var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc0.windows.1-2/install rename to var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/install diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/mtree new file mode 100644 index 00000000000..a21988c17b3 Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-x86_64-git-2.43.0.rc1.windows.1-2/mtree differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/mtree deleted file mode 100644 index 445aabce9ea..00000000000 Binary files a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/mtree and /dev/null differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/desc similarity index 92% rename from var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/desc rename to var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/desc index ed6bece686b..fcc3a8d00b5 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/desc @@ -2,7 +2,7 @@ mingw-w64-x86_64-git-doc-html %VERSION% -2.43.0.rc0.windows.1-2 +2.43.0.rc1.windows.1-2 %BASE% mingw-w64-git @@ -17,16 +17,16 @@ https://git-for-windows.github.io/ any %BUILDDATE% -1698998646 +1699470980 %INSTALLDATE% -1699066804 +1699498772 %PACKAGER% gitforwindowshelper[bot] %SIZE% -17217277 +17220191 %LICENSE% GPL2 diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/files b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/files similarity index 100% rename from var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/files rename to var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/files diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/install b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/install similarity index 100% rename from var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc0.windows.1-2/install rename to var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/install diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/mtree new file mode 100644 index 00000000000..b038797eed3 Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-x86_64-git-doc-html-2.43.0.rc1.windows.1-2/mtree differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc index 3ce5f9650f0..5171168ee24 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc @@ -20,7 +20,7 @@ any 1682971619 %INSTALLDATE% -1699066811 +1699498779 %PACKAGER% Johannes Schindelin diff --git a/var/lib/pacman/sync/clang32.db b/var/lib/pacman/sync/clang32.db index 2edbd35c617..0560f7ee1c1 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 d203b7f2c0f..658317eb4ef 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 137a76b46ea..0ef675fb964 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 a36cce6246b..125208bed53 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 981b2d9520b..aa6c1317cdb 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 813d96f6004..4b929cf4637 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 d026650b640..3114d9fab81 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 2c9500e29e1..1feaee26aea 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 21954923e42..28f3e14a7d1 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 47c849b2df5..419bc239e66 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 f0aecdaeeac..4d51ad6caab 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 2ab6bc4e5ca..9ddea61c74a 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 b8e4d8ea1ca..20084bf357f 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 822b6f183e5..1a710b4e137 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/msys.db b/var/lib/pacman/sync/msys.db index 2e520389d24..29a1b0d80e7 100644 Binary files a/var/lib/pacman/sync/msys.db and b/var/lib/pacman/sync/msys.db differ diff --git a/var/lib/pacman/sync/msys.db.sig b/var/lib/pacman/sync/msys.db.sig index e797daad740..441773f1401 100644 Binary files a/var/lib/pacman/sync/msys.db.sig and b/var/lib/pacman/sync/msys.db.sig differ diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db index 87062b4adb2..83ade07d2c3 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 878eebb9e2c..f6a236cf952 100644 Binary files a/var/lib/pacman/sync/ucrt64.db.sig and b/var/lib/pacman/sync/ucrt64.db.sig differ