git, branch master

The 3rd batch

2026-05-17T13:58:31Z

Signed-off-by: Junio C Hamano

Merge branch 'rs/grep-column-only-match-fix'

2026-05-17T13:58:31Z

"git grep" update. * rs/grep-column-only-match-fix: grep: fix --column --only-match for 2nd and later matches

Merge branch 'hn/git-checkout-m-with-stash'

2026-05-17T13:58:31Z

"git checkout -m another-branch" was invented to deal with local changes to paths that are different between the current and the new branch, but it gave only one chance to resolve conflicts. The command was taught to create a stash to save the local changes. * hn/git-checkout-m-with-stash: checkout -m: autostash when switching branches checkout: rollback lock on early returns in merge_working_tree sequencer: teach autostash apply to take optional conflict marker labels sequencer: allow create_autostash to run silently stash: add --label-ours, --label-theirs, --label-base for apply

Merge branch 'pw/rename-to-get-current-worktree'

2026-05-17T13:58:30Z

Code clean-up. * pw/rename-to-get-current-worktree: worktree: rename get_worktree_from_repository()

Merge branch 'mf/format-patch-cover-letter-format-docfix'

2026-05-17T13:58:30Z

Docfix. * mf/format-patch-cover-letter-format-docfix: Fix docs for format.commitListFormat

Merge branch 'en/ort-cached-rename-with-trivial-resolution'

2026-05-17T13:58:30Z

"ort" merge backend improvements. * en/ort-cached-rename-with-trivial-resolution: merge-ort: handle cached rename & trivial resolution interaction better

Merge branch 'ss/t7004-unhide-git-failures'

2026-05-17T13:58:30Z

Test clean-up. * ss/t7004-unhide-git-failures: t7004: avoid subshells to capture git exit codes t7004: dynamically grab expected state in tests t7004: drop hardcoded tag count for state verification

Merge branch 'en/backfill-fixes-and-edges'

2026-05-17T13:58:29Z

The 'git backfill' command now rejects revision-limiting options that are incompatible with its operation, uses standard documentation for revision ranges, and includes blobs from boundary commits by default to improve performance of subsequent operations. * en/backfill-fixes-and-edges: backfill: default to grabbing edge blobs too backfill: document acceptance of revision-range in more standard manner backfill: reject rev-list arguments that do not make sense

Merge branch 'ps/clang-w-glibc-2.43-and-_Generic'

2026-05-13T01:57:55Z

Headers from glibc 2.43 when used with clang does not allow disabling C11 language features, causing build failures.. * ps/clang-w-glibc-2.43-and-_Generic: build: tolerate use of _Generic from glibc 2.43 with Clang

The second batch

2026-05-12T02:04:46Z

Signed-off-by: Junio C Hamano