Skip to content

git: sync with MSYS2#188

Merged
dscho merged 3 commits intomainfrom
sync-git-with-msys2
Mar 24, 2026
Merged

git: sync with MSYS2#188
dscho merged 3 commits intomainfrom
sync-git-with-msys2

Conversation

@dscho
Copy link
Copy Markdown
Member

@dscho dscho commented Mar 24, 2026

There have been a couple of edits in upstream MSYS2 which we need to integrate into Git for Windows' fork, lest the next Git for Windows version sync will overwrite those edits.

This change requires git-for-windows/build-extra#685 to be merged first.

lazka and others added 3 commits March 24, 2026 14:13
Cherry-picked-from-MSYS2: 3610fd2 (More CPEs, 2026-02-09)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
to match what we do with cygwin git

(Fixed indentation)

Cherry-picked-from-MSYS2: aae0c9d (git: default to nano instead of vim (msys2#28202), 2026-03-01)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
as suggested in
msys2#28202

Cherry-picked-from-MSYS2: d3ff7a1 (git: allow _DEFAULT_EDITOR override, 2026-03-11)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho requested review from mjcheetham and rimrul March 24, 2026 13:40
@dscho dscho self-assigned this Mar 24, 2026
@dscho dscho merged commit ebf5c46 into main Mar 24, 2026
3 checks passed
@dscho dscho deleted the sync-git-with-msys2 branch March 24, 2026 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants