Rebase to v2.54.0-rc1 #6166
Merged
Rebase to v2.54.0-rc1 #6166
GitForWindowsHelper / shears-seen
succeeded
Apr 11, 2026 in 0s
shears/seen rebased successfully
Rebase Summary: seen
From: c85df10c85 (Merge 'readme' into HEAD, 2018-06-07) (15d35d058c..c85df10c85)
To: 0939986fba (Merge 'readme' into HEAD, 2018-06-07) (7a9213c03e..0939986fba)
Statistics
| Metric | Count |
|---|---|
| Total conflicts | 0 |
| Skipped (upstreamed) | 0 |
| Resolved surgically | 0 |
Range-diff (click to expand)
- 1: c9bd6b9 = 1: 631881d unix-socket: avoid leak when initialization fails
- 2: 0155ad3 = 2: 30a7e9b grep: prevent
^$false match at end of file - 3: e32e5de = 3: cd84f92 Merge branch 'fixes-from-the-git-mailing-list'
- 4: eee5d83 = 4: b5f07cd vcpkg_install: detect lack of Git
- 5: 66c8b3e = 5: af68966 vcpkg_install: add comment regarding slow network connections
- 6: bf9bf98 = 6: ee46126 vcbuild: install ARM64 dependencies when building ARM64 binaries
- 7: 0c4df9e = 7: 078159d vcbuild: add an option to install individual 'features'
- 8: 1793bd7 = 8: a03cb58 cmake: allow building for Windows/ARM64
- 9: 60f5662 = 9: 8964d9a mingw: include the Python parts in the build
- 10: 0f12544 = 10: 58b0e43 ci(vs-build) also build Windows/ARM64 artifacts
- 11: 416b855 = 11: baa22e3 win32/pthread: avoid name clashes with winpthread
- 12: da22dd7 = 12: 1be2566 Add schannel to curl installation
- 13: 364d153 = 13: f108d61 hash-object: demonstrate a >4GB/LLP64 problem
- 14: ce646b0 = 14: c787e75 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
- 15: 31c9dfb = 15: 5ac12cd cmake(): allow setting HOST_CPU for cross-compilation
- 16: db9f48a = 16: 338e885 object-file.c: use size_t for header lengths
- 17: cc47527 = 17: 90b4f2a Import the source code of mimalloc v2.2.7
- 18: e4f6223 = 18: 805be7b t9350: point out that refs are not updated correctly
- 19: 525613c = 19: 5ae1f69 CMake: default Visual Studio generator has changed
- 20: 3dad964 = 20: 152ae06 hash algorithms: use size_t for section lengths
- 21: 5314e1c = 21: 33941fc mimalloc: adjust for building inside Git
- 22: dea39ff = 22: d90aad8 transport-helper: add trailing --
- 23: 745c637 = 23: 89a858e mingw: demonstrate a
git addissue with NTFS junctions - 24: b914dc7 = 24: aca93fe .gitignore: add Visual Studio CMakeSetting.json file
- 25: 8353a24 = 25: aefcc13 hash-object --stdin: verify that it works with >4GB/LLP64
- 26: 481c06e = 26: 238c133 mimalloc: offer a build-time option to enable it
- 27: 400ccbc = 27: d5ca03e t5505/t5516: allow running without
.git/branches/in the templates - 28: 997d6da = 28: 6ecb1e7 remote-helper: check helper status after import/export
- 29: e325613 = 29: a1c3c72 clean: do not traverse mount points
- 30: ef06566 = 30: 4e74aa0 strbuf_realpath(): use platform-dependent API if available
- 31: ca543de = 31: bb1f10b http: use new "best effort" strategy for Secure Channel revoke checking
- 32: 429668a = 32: 0a1561e subtree: update
contrib/subtreetesttarget - 33: 9e7ea2d = 33: c009e4e CMakeLists: add default "x64-windows" arch for Visual Studio
- 34: 932ebc7 = 34: 2c3f58b hash-object: add another >4GB/LLP64 test case
- 35: 814df64 = 35: 140be83 mingw: use mimalloc
- 36: 0973dff = 36: 9e795eb t5505/t5516: fix white-space around redirectors
- 37: 5c8ed2a = 37: 57d6955 Always auto-gc after calling a fast-import transport
- 38: 6c997d6 = 38: e12bf81 mingw: prevent regressions with "drive-less" absolute paths
- 39: dd8285f = 39: b6b5f8f clean: remove mount points when possible
- 40: cc4e1a2 = 40: 19004de transport: optionally disable side-band-64k
- 41: 5cc7eda = 41: 56de03c mingw: fix fatal error working on mapped network drives on Windows
- 42: b9d4e3f = 42: 0e5cdf8 clink.pl: fix MSVC compile script to handle libcurl-d.lib
- 43: d7e820f = 43: 3bd1295 mingw: implement a platform-specific
strbuf_realpath() - 44: 875e5e7 = 44: 57aea4d t3701: verify that we can add lots of files interactively
- 45: 4e2bc60 = 45: 1ee9e98 commit: accept "scissors" with CR/LF line endings
- 46: 0443b58 = 46: 89bca6f t0014: fix indentation
- 47: 2b58e3e = 47: e76f98b git-gui: accommodate for intent-to-add files
- 48: f8b9a94 = 48: 46cc973 mingw: allow for longer paths in
parse_interpreter() - 49: 0c7aba2 = 49: 5bb09bd compat/vcbuild: document preferred way to build in Visual Studio
- 50: 80914ae = 50: 597bf40 http: optionally send SSL client certificate
- 51: da988a0 = 51: 4d7c3c0 ci: run
contrib/subtreetests in CI builds - 52: 0ed1342 = 52: 5b71266 CMake: show Win32 and Generator_platform build-option values
- 53: 2a08d03 = 53: bd52974 hash-object: add a >4GB/LLP64 test case using filtered input
- 54: 64873ae = 54: 37b3485 windows: skip linking
git-<command>for built-ins - 55: e0ce486 = 55: 370c4af mingw: stop hard-coding
CC = gcc - 56: 8f2deb7 = 56: 86afad1 mingw: drop the -D_USE_32BIT_TIME_T option
- 57: 32ba881 = 57: a014b1b mingw: only use -Wl,--large-address-aware for 32-bit builds
- 58: 7229823 = 58: 9ee1b45 mingw: avoid over-specifying
--pic-executable - 59: de44f77 = 59: ceef638 mingw: set the prefix and HOST_CPU as per MSYS2's settings
- 60: 481d773 = 60: 08d05ec mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
- 61: d3a86d5 = 61: aa4cbd4 mingw: rely on MSYS2's metadata instead of hard-coding it
- 62: ae29975 = 62: 702a423 mingw: always define
ETC_*for MSYS2 environments - 63: 737e32c = 63: 979dd09 max_tree_depth: lower it for clang builds in general on Windows
- 64: 0a82c2d = 64: 276b09f mingw: ensure valid CTYPE
- 65: 4871fc0 = 65: 2998c04 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
- 66: bfb1076 = 66: 473beb1 mingw: allow
git.exeto be used instead of the "Git wrapper" - 67: 90cfaca = 67: 78752f3 revision: create mark_trees_uninteresting_dense()
- 68: ab0af3e = 68: 04a7882 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
- 69: 1aaeccf = 69: df93673 survey: stub in new experimental 'git-survey' command
- 70: d1c148a = 70: 5a21bfe Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
- 71: 086c4ea = 71: 2fc55e4 survey: add command line opts to select references
- 72: 06fbdb2 = 72: 4382345 clink.pl: fix libexpatd.lib link error when using MSVC
- 73: d43fd5c = 73: e746cf6 survey: start pretty printing data in table form
- 74: ff1f874 = 74: 12ab163 Makefile: clean up .ilk files when MSVC=1
- 75: 11d799c = 75: 779468e survey: add object count summary
- 76: 89c666b = 76: 7c02659 vcbuild: add support for compiling Windows resource files
- 77: 52f2aac = 77: 0c11ac4 survey: summarize total sizes by object type
- 78: 7ad1c17 = 78: 87388c5 config.mak.uname: add git.rc to MSVC builds
- 79: a1bfcf7 = 79: 148131d MinGW: link as terminal server aware
- 80: 1be34af = 80: 2fdb315 survey: show progress during object walk
- 81: 90637d0 = 81: cf458c6 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
- 82: 6df40a6 = 82: c8829e7 http: optionally load libcurl lazily
- 83: a7b4b1b = 83: e89cfdd survey: add ability to track prioritized lists
- 84: ccba8ac = 84: 6742a95 clink.pl: move default linker options for MSVC=1 builds
- 85: ab45519 = 85: 5a4c2c5 http: support lazy-loading libcurl also on Windows
- 86: c8e9240 = 86: 5955119 survey: add report of "largest" paths
- 87: 99d55a6 = 87: ad5bd4b setup: properly use "%(prefix)/" when in WSL
- 88: 95fae28 = 88: c4d470d Add config option
windows.appendAtomically - 89: dd78b37 = 89: ae77ed4 cmake: install headless-git.
- 90: bba0c07 = 90: 075a88d http: when loading libcurl lazily, allow for multiple SSL backends
- 91: 46ac803 = 91: deeb4ae survey: add --top= option and config
- 108: f0c8127 = 92: 7e324e3 mingw: make sure
errnois set correctly when socket operations fail - 92: da5a912 = 93: a90ded0 compat/mingw.c: do not warn when failing to get owner
- 93: 67d3eb3 = 94: 96ef9d8 mingw: $env:TERM="xterm-256color" for newer OSes
- 94: cbb5f4c = 95: a73537a winansi: check result and Buffer before using Name
- 95: 57bff58 = 96: f536fb5 mingw: change core.fsyncObjectFiles = 1 by default
- 96: 3edbdac = 97: cfbd98f Fix Windows version resources
- 97: f53aaef = 98: 8b75815 status: fix for old-style submodules with commondir
- 98: b272306 = 99: a591638 git.rc: include winuser.h
- 99: 9c27120 = 100: 420fb1c mingw: do load libcurl dynamically by default
- 100: f9f54c2 = 101: 9baf7b4 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
- 101: 41d7ba6 = 102: 2a5fcc3 mingw: suggest
windows.appendAtomicallyin more cases - 102: df7f642 = 103: bbefcd4 win32: use native ANSI sequence processing, if possible
- 103: 493241f = 104: d451f3e common-main.c: fflush stdout buffer upon exit
- 104: b6d3674 = 105: 5e75e32 t5601/t7406(mingw): do run tests with symlink support
- 105: 0d362a2 = 106: 1afe244 win32: ensure that
localtime_r()is declared even in i686 builds - 106: 7fe112c = 107: 62df632 Fallback to AppData if XDG_CONFIG_HOME is unset
- 107: 21bb070 = 108: 4e79c69 run-command: be helpful with Git LFS fails on Windows 7
- 109: a0d35c9 = 109: f980667 survey: clearly note the experimental nature in the output
- 110: 1ee6582 = 110: 9c1e1ff Merge 'remote-hg-prerequisites' into HEAD
- 111: 66d1e77 = 111: d13e757 Merge branch 'drive-prefix'
- 112: a9a85b7 = 112: a6fff44 Merge branch 'dont-clean-junctions'
- 115: ac741ae = 113: d71f970 Merge branch 'msys2-python'
- 118: 4cf9be0 = 114: 1cf0b2e Update mimalloc to v2.2.7 (#6048)
- 121: dfa9445 = 115: 4daf664 Merge pull request #2375 from assarbad/reintroduce-sideband-config
- 129: 8357480 = 116: 9373b5b Merge pull request #2488 from bmueller84/master
- 130: 70825c0 = 117: aacb0d4 Merge pull request #2501 from jeffhostetler/clink-debug-curl
- 131: 1505b69 = 118: a227a23 Merge pull request #2504 from dscho/access-repo-via-junction
- 132: 6811a3a = 119: 0bc32d8 Merge pull request #2535 from dscho/schannel-revoke-best-effort
- 133: 3d727f0 = 120: f1e8165 Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
- 134: c4e9b3c = 121: b9f2c46 Merge 'add-p-many-files'
- 135: ba7fd02 = 122: e9d85cd Merge pull request #2714 from lbonanomi/crlf-scissors
- 136: 2922f0b = 123: 1f62a6d Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
- 137: 3660ce2 = 124: d9f18f9 Merge 'git-gui/js/intent-to-add'
- 138: 863edb4 = 125: eaa9743 Merge pull request #2351 from PhilipOakley/vcpkg-tip
- 139: bc76ea3 = 126: 6102d57 Merge pull request #2915 from dennisameling/windows-arm64-support
- 140: 1fe2e30 = 127: dd34583 Merge pull request #3327 from dennisameling/fix-host-cpu
- 141: 36b99e1 = 128: 298e652 Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path
- 142: 8555fc5 = 129: 13c5bab Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
- 143: be515fd = 130: c79f2d1 Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate
- 144: 192fa00 = 131: 3921004 Merge pull request #3349 from vdye/feature/ci-subtree-tests
- 113: 0b300e5 = 132: 5667595 compat/mingw: handle WSA errors in strerror
- 114: 092458d = 133: 546b948 t5563: verify that NTLM authentication works
- 145: d5d4ccd = 134: 6ebc9f7 Merge pull request #3306 from PhilipOakley/vs-sln
- 116: b40575f = 135: cf7e727 compat/mingw: drop outdated comment
- 117: 4931c10 = 136: e0827ca http: disallow NTLM authentication by default
- 146: c5f2462 = 137: 89abdb1 Merge pull request #3533 from PhilipOakley/hashliteral_t
- 119: 0bc4960 = 138: 825d91f t0301: actually test credential-cache on Windows
- 120: 30266d7 = 139: ca02c72 http: warn if might have failed because of NTLM
- 147: 7da5257 = 140: 9f49b2a Merge pull request #3791: Various fixes around
safe.directory - 122: c4780f0 = 141: 8666e81 credential-cache: handle ECONNREFUSED gracefully
- 123: 17641b4 = 142: 40dd195 reftable: do make sure to use custom allocators
- 124: f663a76 = 143: 2227ea5 check-whitespace: avoid alerts about upstream commits
- 125: f87501c = 144: a5c06a5 t/t5571-prep-push-hook.sh: Add test with writing to stderr
- 126: 5c7a0be = 145: d30b903 credential: advertise NTLM suppression and allow helpers to re-enable
- 127: f73ff61 = 146: 6c720c9 dir: do not traverse mount points
- 128: d047b74 = 147: c580325 win32: thread-utils: handle multi-socket systems
- 148: 75b1a5e = 148: 0788110 Merge pull request #3751 from rkitover/native-term
- 149: 15ee983 = 149: d4c66b3 Merge pull request #3875 from 1480c1/wine/detect_msys_tty
- 150: 87bb525 = 150: 8e28d04 Merge branch 'optionally-dont-append-atomically-on-windows'
- 151: fefdacf = 151: 726187f Merge branch 'fsync-object-files-always'
- 152: ab4db28 = 152: 2fb9a15 Merge pull request #3942 from rimrul/mingw-tsaware
- 153: 3c1bd75 = 153: 0064d43 Fix Windows version resources (#4092)
- 154: 7c61f5e = 154: bcd6566 Fix global repository field not being cleared (#4083)
- 155: 6dbed56 = 155: 5c8271c Skip linking the "dashed"
git-<command>s for built-ins (#4252) - 156: f93acc4 = 156: 87afb48 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (#5971) - 157: 0b5a4be = 157: 5a75e05 Merge pull request #2506 from dscho/issue-2283
- 158: c726e59 = 158: 6da01d0 Merge pull request #2974 from derrickstolee/maintenance-and-headless
- 159: aea29a4 = 159: c10f8c3 ARM64: Embed manifest properly (#4718)
- 160: cefd51c = 160: e2015a5 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (#4410)
- 161: 9b68866 = 161: db9fa72 Merge branch 'nano-server'
- 162: 352753f = 162: a57ee4a Additional error checks for issuing the windows.appendAtomically warning (#4528)
- 163: 22300c7 = 163: 914c942 win32: use native ANSI sequence processing, if possible (#4700)
- 164: 22b46d3 = 164: 6157989 common-main.c: fflush stdout buffer when exit (#4901)
- 165: 48e6fde = 165: bfc482e Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
- 166: 464f6cf = 166: 2a1ddd1 Merge branch 'Fix-i686-build-with-GCC-v14'
- 167: 4ba086b = 167: adc5b49 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
- 168: c891df0 = 168: 21c25c4 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
- 169: ba3828e = 169: 68a20d3 pack-objects: create new name-hash algorithm (#5157)
- 170: a2575c3 = 170: 501e90e Add path walk API and its use in 'git pack-objects' (#5171)
- 171: 4128e18 = 171: fdaa9b8 Add experimental 'git survey' builtin (#5174)
- 172: 50295c6 = 172: 1b13532 credential-cache: handle ECONNREFUSED gracefully (#5329)
- 173: 1b141ee = 173: 9d1b627 Merge branch 'reftable-vs-custom-allocators'
- 174: a67d309 = 174: 54fc030 Merge branch 'check-whitespace-only-downstream'
- 175: 2a53517 = 175: dd25084 t/t5571-prep-push-hook.sh: Add test with writing to stderr (#6063)
- 176: c10ea27 = 176: 100a83b Merge branch 'disallow-ntlm-auth-by-default'
- 177: 8777519 = 177: 5aa7ff6 Don't traverse mount points in
remove_dir_recurse()(#6151) - 178: 48cea8b = 178: 791b188 Detect number of cores better on multi-socket systems (#6108)
- 179: 25fa9fa = 179: aca2b5f Merge branch 'ready-for-upstream'
- 180: 0173073 = 180: e8fdbcd ci(macos): skip the
git p4tests - 181: 1cbcb07 = 181: c7ba8f1 ci(macos): skip the
git p4tests (#5954) - 200: d9686a6 = 182: ecf2dfd git-gui--askyesno: fix funny text wrapping
- 182: bc49615 = 183: 7db552b Win32: make FILETIME conversion functions public
- 183: d511670 = 184: eba26d0 Win32: dirent.c: Move opendir down
- 184: 8d30229 = 185: 83efb15 mingw: make the dirent implementation pluggable
- 185: 642d1d1 = 186: 5ebca23 Win32: make the lstat implementation pluggable
- 186: f225d26 = 187: 021a608 mingw: add infrastructure for read-only file system level caches
- 187: fb9086f = 188: 91f934b mingw: add a cache below mingw's lstat and dirent implementations
- 188: 4549258 = 189: 4ef8447 fscache: load directories only once
- 189: 75a975d = 190: 3e15043 fscache: add key for GIT_TRACE_FSCACHE
- 190: 36e51c8 = 191: 96ad251 fscache: remember not-found directories
- 191: e961010 = 192: c662d9f fscache: add a test for the dir-not-found optimization
- 192: cd587bc = 193: bc49647 add: use preload-index and fscache for performance
- 193: 33737a6 = 194: 8853ab8 dir.c: make add_excludes aware of fscache during status
- 194: d62bf7d = 195: 1b80f1c fscache: make fscache_enabled() public
- 195: 34447bf = 196: 821cd3a dir.c: regression fix for add_excludes with fscache
- 196: c551c95 = 197: ed52140 fetch-pack.c: enable fscache for stats under .git/objects
- 197: 1516855 = 198: a67aea4 checkout.c: enable fscache for checkout again
- 198: dee7f6c = 199: 20bc597 Enable the filesystem cache (fscache) in refresh_index().
- 199: 2f1e0c9 = 200: a4bf48f fscache: use FindFirstFileExW to avoid retrieving the short name
- 201: 33d5510 = 201: cf2349e fscache: add GIT_TEST_FSCACHE support
- 203: 79d8596 = 202: 832615c fscache: add fscache hit statistics
- 205: 3f46876 = 203: c2a1b00 unpack-trees: enable fscache for sparse-checkout
- 206: 27dac7b = 204: 170a2b8 status: disable and free fscache at the end of the status command
- 207: b3b51a1 = 205: fef3460 mem_pool: add GIT_TRACE_MEMPOOL support
- 208: 59ff2a0 = 206: 0741d00 fscache: fscache takes an initial size
- 209: 7149e30 = 207: aa25185 fscache: update fscache to be thread specific instead of global
- 210: 3f219a0 = 208: d1aaa0c fscache: teach fscache to use mempool
- 211: 7e91ee9 = 209: 5d4b890 fscache: make fscache_enable() thread safe
- 212: 7a1161c = 210: a6ee9c6 fscache: teach fscache to use NtQueryDirectoryFile
- 213: 87b1849 = 211: 81d1477 fscache: remember the reparse tag for each entry
- 214: 0651be1 = 212: a1eded6 Merge branch 'fscache'
- 215: db58cbe = 213: 7bbc107 fscache: implement an FSCache-aware is_mount_point()
- 216: f465123 = 214: 91e32bf Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
- 217: d538525 = 215: 7d08709 clean: make use of FSCache
- 218: bc248c7 = 216: d9b6da9 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
- 219: b2dfcb6 = 217: b03db17 Merge branch 'dont-clean-junctions-fscache'
- 220: 825d1e4 = 218: 943a2ed pack-objects (mingw): demonstrate a segmentation fault with large deltas
- 221: 2b82794 = 219: d8dfb8d mingw: support long paths
- 222: a5c6bd4 = 220: f50bfba win32(long path support): leave drive-less absolute paths intact
- 223: 4a0d99b = 221: 497cb5b compat/fsmonitor/fsm-*-win32: support long paths
- 224: dca2648 = 222: c6bba7d clean: suggest using
core.longPathsif paths are too long to remove - 225: da17810 = 223: b38c1c7 mingw: Support
git_terminal_promptwith more terminals - 226: 10741a0 = 224: db9b72b compat/terminal.c: only use the Windows console if bash 'read -r' fails
- 227: 9676596 = 225: bb227c6 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
- 228: c0fdd34 = 226: b30a186 Win32: symlink: move phantom symlink creation to a separate function
- 229: 0e1dc89 = 227: 65ea32c Introduce helper to create symlinks that knows about index_state
- 230: eab4eae = 228: 02b0744 mingw: allow to specify the symlink type in .gitattributes
- 231: 5c901f4 = 229: 57a3c48 Win32: symlink: add test for
symlinkattribute - 232: 84e2969 = 230: 7d420b2 mingw: explicitly specify with which cmd to prefix the cmdline
- 244: a9055ba = 231: 51f72a1 mingw: introduce code to detect whether we're inside a Windows container
- 233: 6cc1d94 = 232: ce4d95a mingw: when path_lookup() failed, try BusyBox
- 246: 4cf14a3 = 233: a077755 mingw: when running in a Windows container, try to rename() harder
- 234: e1ca750 = 234: 1fa7ef9 test-tool: learn to act as a drop-in replacement for
iconv - 248: ba605e5 = 235: 508edaa mingw: move the file_attr_to_st_mode() function definition
- 235: 0959abb = 236: 64b8b6f tests(mingw): if
iconvis unavailable, usetest-helper --iconv - 202: 3622427 = 237: 04ded7c git-gui--askyesno (mingw): use Git for Windows' icon, if available
- 250: b38f058 = 238: 86d302d mingw: Windows Docker volumes are not symbolic links
- 236: 0bca74b = 239: d20e77a gitattributes: mark .png files as binary
- 204: c53797b = 240: 5c498f5 Merge branch 'git-gui-askyesno'
- 252: ceb2181 = 241: e26d026 mingw: work around rename() failing on a read-only file
- 237: 9d4b1d0 = 242: dcd2f40 tests: move test PNGs into t/lib-diff/
- 238: d830ec9 = 243: 549e69d tests: only override sort & find if there are usable ones in /usr/bin/
- 239: 102fd93 = 244: 139d671 tests: use the correct path separator with BusyBox
- 240: 7c9ddc7 = 245: a6dba15 mingw: only use Bash-ism
builtin pwd -Wwhen available - 241: dbcd644 = 246: e1968b7 tests (mingw): remove Bash-specific pwd option
- 242: 83f3804 = 247: 4ba8517 test-lib: add BUSYBOX prerequisite
- 254: e8f9a26 = 248: 427f4d0 Merge branch 'gitk-and-git-gui-patches'
- 243: 0ecc9e4 = 249: a2e64d1 t5003: use binary file from t/lib-diff/
- 255: af351a9 = 250: cb4cf81 Merge branch 'long-paths'
- 245: 4db94a0 = 251: 8cc5377 t5532: workaround for BusyBox on Windows
- 256: 5e0e357 = 252: 47b05bb Merge branch 'msys2'
- 247: c2f005f = 253: 6ebff84 t5605: special-case hardlink test for BusyBox-w32
- 257: d0969a4 = 254: 20704a4 Merge 'docker-volumes-are-no-symlinks'
- 249: 62e07ec = 255: bae3ade t5813: allow for $PWD to be a Windows path
- 258: b787e1e = 256: 1a776ec mingw: try resetting the read-only bit if rename fails (#4527)
- 260: a16a551 = 257: 7990dd2 Describe Git for Windows' architecture [no ci]
- 251: 8c3d124 = 258: acf8f5d t9200: skip tests when $PWD contains a colon
- 259: 569cad8 = 259: e642ded Merge pull request #1897 from piscisaureus/symlink-attr
- 263: 0bf1b3d = 260: bb2b51e Modify the Code of Conduct for Git for Windows
- 261: 78980e4 = 261: 1ec1e82 mingw: kill child processes in a gentler way
- 253: 6093c40 = 262: 6b4a75f mingw: optionally enable wsl compability file mode bits
- 262: 0871cb6 = 263: 80272c6 Merge branch 'busybox-w32'
- 266: 9424030 = 264: 15893a6 CONTRIBUTING.md: add guide for first-time contributors
- 264: afd22d4 = 265: 9c2e061 mingw: really handle SIGINT
- 265: 2b61d3d = 266: 4218a61 Merge branch 'wsl-file-mode-bits'
- 269: 878f15f = 267: da06538 README.md: Add a Windows-specific preamble
- 267: 23723e9 = 268: 8a473ab Partially un-revert "editor: save and reset terminal after calling EDITOR"
- 268: 19b4a8b = 269: b7557e9 Merge pull request #1170 from dscho/mingw-kill-process
- 272: 744a320 = 270: 3ccce4e Add an issue template
- 270: 9aa3b27 = 271: 2070941 reset: reinstate support for the deprecated --stdin option
- 271: 8a6bea5 = 272: 67393c9 Merge branch 'un-revert-editor-save-and-reset'
- 273: ecd2691 = 273: 348c85d Add a GitHub workflow to monitor component updates
- 276: 2008a9d = 274: a45b770 Modify the GitHub Pull Request template (to reflect Git for Windows)
- 274: 32ff0d1 = 275: 2abde39 fsmonitor: reintroduce core.useBuiltinFSMonitor
- 275: 2e28d3a = 276: f718171 Merge branch 'phase-out-reset-stdin'
- 277: 7542030 = 277: 8ab8b51 dependabot: help keeping GitHub Actions versions up to date
- 279: 4d20249 = 278: b1873e8 SECURITY.md: document Git for Windows' policies
- 278: bfba089 = 279: 2a49f36 Merge branch 'deprecate-core.useBuiltinFSMonitor'
- 280: a954502 = 280: 4fc0936 Merge pull request #2837 from dscho/monitor-component-updates
- 281: c85df10 = 281: 0939986 Merge 'readme' into HEAD
Loading