git/Documentation, branch next

Sync with 'master'

2026-05-17T14:01:33Z

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

The 3rd batch

2026-05-17T13:58:31Z

Signed-off-by: Junio C Hamano

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 '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/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 'mm/git-url-parse' into next

2026-05-15T01:46:53Z

The internal URL parsing logic has been made accessible via a new subcommand "git url-parse". * mm/git-url-parse: t9904: add tests for the new url-parse builtin doc: describe the url-parse builtin builtin: create url-parse command urlmatch: define url_parse function url: return URL_SCHEME_UNKNOWN instead of dying url: move scheme detection to URL header/source url: move url_is_local_not_ssh to url.h connect: rename enum protocol to url_scheme

Merge branch 'kh/doc-log-decorate-list' into next

2026-05-15T01:46:52Z

Doc update. * kh/doc-log-decorate-list: doc: log: use the same delimiter in description list doc: log: fix --decorate description list

Merge branch 'ps/history-fixup' into next

2026-05-13T03:21:28Z

"git history" learned "fixup" command. * ps/history-fixup: builtin/history: introduce "fixup" subcommand builtin/history: generalize function to commit trees replay: allow callers to control what happens with empty commits

Merge branch 'js/adjust-tests-to-explicitly-access-bare-repo' into next

2026-05-13T03:21:27Z

Some tests assume that bare repository accesses are by default allowed; rewrite some of them to avoid the assumption, rewrite others to explicitly set safe.bareRepository to allow them. * js/adjust-tests-to-explicitly-access-bare-repo: safe.bareRepository: default to "explicit" with WITH_BREAKING_CHANGES status tests: filter `.gitconfig` from status output ls-files tests: filter `.gitconfig` from `--others` output t5601: restore `.gitconfig` after includeIf test t1305: use `--git-dir=.` for bare repo in include cycle test t1300: remove global config settings injected by test-lib.sh t7900: do not let `$HOME/.gitconfig` interfere with XDG tests test-lib: allow bare repository access when breaking changes are enabled