The Git List

Phillip Wood proposed that the ort merge machinery write the labels to .git/MERGE_LABELS so git checkout -m <path> can reuse them. Junio Hamano suggested API tidy-ups; a side question about remembering conflict style drew objections from Johannes Sixt.

Julia Evans's seven-patch series adds a gitmergeconflicts page and links to it from conflict-producing commands. Junio Hamano asked whether conflict-marker labels and "deleted by us" wording should change; Evans said docs can drive code changes and shared a draft "ours and theirs" section.

Kristofer Karlsson's series adds transfer.connectivityCheck=incremental. Patrick Steinhardt said he would welcome a check that scales with changes, but questioned whether extra connectivity roots would help and asked for clearer documentation.

Matthew Luallen reported three date-handling bugs seen on Git 2.56.0. René Scharfe has been working through the ZIP behavior, asking whether anything actually uses the DOS timestamp and noting that clamping is possible.

Hanan Arshad's RFC proposed porcelain around git stash export/import for handing off stashes via a remote. Johannes Sixt and Junio Hamano said branches already do this; Arshad dropped stash publish but is considering a narrower proposal.

Colin Hinton's patch stores the raw fetch.followRemoteHEAD string and validates it only where do_fetch() uses it. Junio Hamano sees two minor remaining issues; Matt Hunter commented on how the new state variables are interpreted.

Johannes Schindelin announced Git for Windows 2.56.0(2). It bundles OpenSSL v3.5.9, adds a Git Credential Manager compatibility shim, and fixes GIT_CONFIG_GLOBAL=NUL, which had stopped working in 2.56.0.