git/Documentation/config, branch seen

Merge branch 'jt/config-lock-timeout' into seen

2026-05-18T05:29:05Z

Configuration file locking now retries for a short period, avoiding failures when multiple processes attempt to update the configuration simultaneously. Comments? cf. * jt/config-lock-timeout: config: retry acquiring config.lock, configurable via core.configLockTimeout

Merge branch 'ja/doc-synopsis-style-again' into seen

2026-05-18T05:29:05Z

A batch of documentation pages has been updated to use the modern synopsis style. Comments? * ja/doc-synopsis-style-again: doc: convert git-imap-send synopsis and options to new style doc: convert git-apply synopsis and options to new style doc: convert git-am synopsis and options to new style doc: convert git-grep synopsis and options to new style doc: convert git-bisect to synopsis style

Merge branch 'hn/branch-prune-merged' into seen

2026-05-18T05:29:03Z

"git branch" command learned "--prune-merged" option to remove local branches that have already been merged to the remote-tracking branches they track. Comments? * hn/branch-prune-merged: branch: add --all-remotes flag branch: add branch..pruneMerged opt-out branch: add --prune-merged branch: let delete_branches warn instead of error on bulk refusal branch: add --forked

Merge branch 'cc/promisor-auto-config-url-more' into seen

2026-05-18T05:29:01Z

The handling of promisor-remote protocol capability has been loosened to allow the other side to add to the list of promisor remotes via the promisor.acceptFromServerURL configuration variable. * cc/promisor-auto-config-url-more: doc: promisor: improve acceptFromServer entry promisor-remote: auto-configure unknown remotes promisor-remote: trust known remotes matching acceptFromServerUrl promisor-remote: introduce promisor.acceptFromServerUrl promisor-remote: add 'local_name' to 'struct promisor_info' urlmatch: add url_normalize_pattern() helper urlmatch: change 'allow_globs' arg to bool t5710: simplify 'mkdir X' followed by 'git -C X init'

Merge branch 'pt/fsmonitor-linux' into seen

2026-05-18T05:28:59Z

The fsmonitor daemon has been implemented for Linux. * pt/fsmonitor-linux: fsmonitor: convert shown khash to strset in do_handle_client fsmonitor: add tests for Linux fsmonitor: add timeout to daemon stop command fsmonitor: close inherited file descriptors and detach in daemon run-command: add close_fd_above_stderr option fsmonitor: implement filesystem change listener for Linux fsmonitor: rename fsm-settings-darwin.c to fsm-settings-unix.c fsmonitor: rename fsm-ipc-darwin.c to fsm-ipc-unix.c fsmonitor: use pthread_cond_timedwait for cookie wait compat/win32: add pthread_cond_timedwait fsmonitor: fix hashmap memory leak in fsmonitor_run_daemon fsmonitor: fix khash memory leak in do_handle_client t9210, t9211: disable GIT_TEST_SPLIT_INDEX for scalar clone tests

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

2026-05-18T05:28:57Z

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. Comments? * ds/fetch-negotiation-options: send-pack: pass negotiation config in push remote: add remote.*.negotiationInclude config fetch: add --negotiation-include option for negotiation negotiator: add have_sent() interface remote: add remote.*.negotiationRestrict config transport: rename negotiation_tips fetch: add --negotiation-restrict option t5516: fix test order flakiness

config: retry acquiring config.lock, configurable via core.configLockTimeout

2026-05-18T00:30:29Z

Concurrent config writers race for the ".lock" file, which is taken with open(O_EXCL) and no retry, so the losers fail right away with "could not lock config file". This shows up with parallel "git worktree add -b" against the same repository: each one writes a couple of branch.* keys and the losers fail at random. Worse, "git worktree add" doesn't propagate that failure to its exit code, so the tracking config is silently dropped. (The swallowed error is a separate bug.) Retry instead of giving up on the first EEXIST. The lock is only held while rewriting a small file, so the loser only has to wait out the other writers. Same approach as 4ff0f01cb7 (refs: retry acquiring reference locks for 100ms, 2017-08-21). On the semantics: the on-disk config is read only after the lock is taken, so writers touching different keys can't lose each other's change. Writers touching the same key still get last-writer-wins, but that is already the case today and would need a compare-and-swap config API to fix. The retry only turns hard failures into successes. Default to 1000ms, like core.packedRefsTimeout: same shape of problem, one shared file everyone serializes through. A larger timeout only costs anything when a stale lock is left behind by a crash, which is rare; a smaller one fails spuriously on slow filesystems (NTFS has been seen needing more than 100ms). Make it configurable as core.configLockTimeout. There is no chicken-and-egg problem: we read the config before we lock it. microsoft/git carries a similar patch (core.configWriteLockTimeoutMS, default off) for Scalar's tests. Defaulting to non-zero here because the worktree case fails silently. Helped-by: Patrick Steinhardt Helped-by: Johannes Schindelin Signed-off-by: Jörg Thalheim Signed-off-by: Junio C Hamano

doc: convert git-imap-send synopsis and options to new style

2026-05-17T23:50:34Z

Convert git-imap-send from [verse]/single-quote style to the modern synopsis-block style: - Replace [verse] with [synopsis] in SYNOPSIS block - Backtick-quote all OPTIONS terms - Backtick-quote all config keys in config/imap.adoc - Backtick-quote bare config key references in prose Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano

doc: convert git-apply synopsis and options to new style

2026-05-17T23:50:33Z

Convert git-apply from [verse]/single-quote style to the modern synopsis-block style: - Replace [verse] with [synopsis] in SYNOPSIS block - Backtick-quote all OPTIONS terms and config keys in config/apply.adoc - Convert single-quoted inline commands ('git apply', 'diff', etc.) - Wrap standalone placeholders in underscores (, , ) - Backtick-quote `*.rej` and GNU `patch` tool references Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano

doc: convert git-am synopsis and options to new style

2026-05-17T23:50:33Z

Convert git-am from [verse]/single-quote style to the modern synopsis-block style: - Replace [verse] with [synopsis] in SYNOPSIS block - Backtick-quote all OPTIONS terms - Convert inline man page refs - Convert inline command refs - Convert prose placeholders: Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano