git/Documentation, branch main

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

The second batch

2026-05-12T02:04:46Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/neuter-sideband-fixup'

2026-05-11T04:49:05Z

Try to resurrect and reboot a stalled "avoid sending risky escape sequences taken from sideband to the terminal" topic by Dscho. The plan is to keep it in 'next' long enough to see if anybody screams with the "everything dropped except for ANSI color escape sequences" default. * jc/neuter-sideband-fixup: sideband: drop 'default' configuration sideband: offer to configure sanitizing on a per-URL basis sideband: add options to allow more control sequences to be passed through sideband: do allow ANSI color sequences by default sideband: introduce an "escape hatch" to allow control characters sideband: mask control characters

Start 2.55 cycle

2026-05-11T01:05:55Z

Signed-off-by: Junio C Hamano

Merge branch 'sb/userdiff-lisp-family'

2026-05-11T01:05:54Z

The userdiff driver for the Scheme language has been extended to cover other Lisp dialects. * sb/userdiff-lisp-family: userdiff: extend Scheme support to cover other Lisp dialects userdiff: tighten word-diff test case of the scheme driver

Merge branch 'jc/doc-timestamps-in-stat'

2026-05-11T01:05:54Z

Doc update. * jc/doc-timestamps-in-stat: CodingGuidelines: st_mtimespec vs st_mtim vs st_mtime

Merge branch 'ar/parallel-hooks'

2026-05-11T01:05:53Z

Hook scripts defined via the configuration system can now be configured to run in parallel. * ar/parallel-hooks: t1800: test SIGPIPE with parallel hooks hook: allow hook.jobs=-1 to use all available CPU cores hook: add hook..enabled switch hook: move is_known_hook() to hook.c for wider use hook: warn when hook..jobs is set hook: add per-event jobs config hook: add -j/--jobs option to git hook run hook: mark non-parallelizable hooks hook: allow pre-push parallel execution hook: allow parallel hook execution hook: parse the hook.jobs config config: add a repo_config_get_uint() helper repository: fix repo_init() memleak due to missing _clear()