git/Documentation, branch jch

Merge branch 'cl/conditional-config-on-worktree-path' into jch

2026-04-17T04:27:22Z

The [includeIf "condition"] conditional inclusion facility for configuration files has learned to use the location of worktree in its condition. Comments? * cl/conditional-config-on-worktree-path: config: add "worktree" and "worktree/i" includeIf conditions config: refactor include_by_gitdir() into include_by_path()

Merge branch 'ds/fetch-negotiation-options' into jch

2026-04-17T04:27:22Z

The negotiation tip options in "git fetch" have been reworked to allow requiring certain refs to be sent as "have" lines, and to restrict negotiation to a specific set of refs. * ds/fetch-negotiation-options: send-pack: pass negotiation config in push remote: add negotiationRequire config as default for --negotiation-require fetch: add --negotiation-require option for negotiation remote: add remote.*.negotiationRestrict config transport: rename negotiation_tips fetch: add --negotiation-restrict option t5516: fix test order flakiness

Merge branch 'sa/cat-file-batch-mailmap-switch' into jch

2026-04-17T04:27:21Z

"git cat-file --batch" learns an in-line command "mailmap" that lets the user toggle use of mailmap. * sa/cat-file-batch-mailmap-switch: cat-file: add mailmap subcommand to --batch-command

Merge branch 'ua/push-remote-group' (early part) into jch

2026-04-17T04:27:21Z

* 'ua/push-remote-group' (early part): push: support pushing to a remote group remote: move remote group resolution to remote.c

Merge branch 'lp/repack-propagate-promisor-debugging-info' into jch

2026-04-17T04:27:19Z

When fetching objects into a lazily cloned repository, .promisor files are created with information meant to help debugging. "git repack" has been taught to carry this information forward to packfiles that are newly created. * lp/repack-propagate-promisor-debugging-info: SQUASH??? repack-promisor: add missing headers t7703: test for promisor file content after geometric repack t7700: test for promisor file content after repack repack-promisor: preserve content of promisor files after repack repack-promisor add helper to fill promisor file after repack pack-write: add explanation to promisor file content

Merge branch 'ar/parallel-hooks' into jch

2026-04-17T04:27:18Z

* 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()

Merge branch 'cc/promisor-auto-config-url' into jch

2026-04-17T04:27:18Z

Promisor remote handling has been refactored and fixed in preparation for auto-configuration of advertised remotes. * cc/promisor-auto-config-url: t5710: use proper file:// URIs for absolute paths promisor-remote: remove the 'accepted' strvec promisor-remote: keep accepted promisor_info structs alive promisor-remote: refactor accept_from_server() promisor-remote: refactor has_control_char() promisor-remote: refactor should_accept_remote() control flow promisor-remote: reject empty name or URL in advertised remote promisor-remote: clarify that a remote is ignored promisor-remote: pass config entry to all_fields_match() directly promisor-remote: try accepted remotes before others in get_direct()

Merge branch 'ja/doc-difftool-synopsis-style' into jch

2026-04-17T04:27:17Z

Doc mark-up updates. * ja/doc-difftool-synopsis-style: doc: convert git-describe manual page to synopsis style doc: convert git-shortlog manual page to synopsis style doc: convert git-range-diff manual page to synopsis style doc: convert git-difftool manual page to synopsis style

Merge branch 'jc/neuter-sideband-fixup' into jch

2026-04-17T04:27:17Z

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

doc: fix grammar errors in submodule description

2026-04-17T04:22:01Z

6cc6d1b4c699 (Documentation: update add --force option + ignore=all config, 2026-02-06) added text describing both the ignore=none and ignore=all behaviors. The former had minor formatting and grammatical errors, while the latter was a bit garbled. I have tried to tweak the wording on the latter to make it read as I think was intended, and fixed the minor grammatical issues with both as well. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano