git, branch next

Sync with 'master'

2026-05-17T14:01:33Z

Merge branch 'jk/dumb-http-alternate-fix' into next

2026-05-17T14:01:23Z

The HTTP walker misinterpreted the alternates file that gives an absolute path when the server URL does not have the final slash (i.e., "https://example.com" not "https://example.com/"). * jk/dumb-http-alternate-fix: http: handle absolute-path alternates from server root

Merge branch 'jk/pretty-no-strbuf-presizing' into next

2026-05-17T14:01:23Z

Remove ineffective strbuf presizing that would have computed an allocation that would not have fit in the available memory anyway, or too small due to integer wraparound to cause immediate automatic growing. * jk/pretty-no-strbuf-presizing: pretty: drop strbuf pre-sizing from add_rfc2047()

Merge branch 'ag/sequencer-remove-unused-struct-member' into next

2026-05-17T14:01:22Z

Code clean-up. * ag/sequencer-remove-unused-struct-member: sequencer: remove todo_add_branch_context.commit

Merge branch 'mm/diff-U-takes-no-negative-values' into next

2026-05-17T14:01:22Z

The command line parser for "git diff" learned a few options take only non-negative integers. * mm/diff-U-takes-no-negative-values: parse-options: clarify what "negated" means for PARSE_OPT_NONEG xdiff: guard against negative context lengths diff: reject negative values for -U/--unified diff: reject negative values for --inter-hunk-context

Merge branch 'dk/doc-exclude-is-shared-per-repo' into next

2026-05-17T14:01:22Z

Document the fact that .git/info/exclude is shared across worktrees linked to the same repository. * dk/doc-exclude-is-shared-per-repo: ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR

Merge branch 'kk/paint-down-to-common-optim' into next

2026-05-17T14:01:22Z

"git merge-base" optimization. * kk/paint-down-to-common-optim: commit-reach: early exit paint_down_to_common for single merge-base commit-reach: introduce merge_base_flags enum

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