git, 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 'kn/refs-fsck-skip-lock-files' into seen

2026-05-18T05:29:04Z

The consistency checks for the files reference backend have been updated to skip lock files earlier, avoiding unnecessary parsing of intermediate files. * kn/refs-fsck-skip-lock-files: refs/files: skip lock files during consistency checks

Merge branch 'hn/config-typo-advice' into seen

2026-05-18T05:29:04Z

"git config foo.bar=baz" is not likely to be a request to read the value of such a variable with '=' in its name; rather it is plausible that the user meant "git config set foo.bar baz". Give advice when giving an error message. Comments? * hn/config-typo-advice: config: suggest the correct form when key contains "=" in set context

Merge branch 'rs/strbuf-add-oid-hex' into seen

2026-05-18T05:29:04Z

Formatting object name in full hexadecimal form has been optimized by using a new strbuf_add_oid_hex() helper function. Comments? * rs/strbuf-add-oid-hex: hex: add and use strbuf_add_oid_hex()

Merge branch 'mm/doc-word-diff' into seen

2026-05-18T05:29:04Z

The documentation for "--word-diff" has been extended with a bit of implementation detail of where these different words come from. Comments? * mm/doc-word-diff: doc: clarify that --word-diff operates on line-level hunks

Merge branch 'hn/status-pull-advice-qualified' into seen

2026-05-18T05:29:03Z

Advice shown by "git status" when the local branch is behind or has diverged from its push branch has been updated to suggest "git pull ". Comments? * hn/status-pull-advice-qualified: remote: qualify "git pull" advice for non-upstream branches

Merge branch 'rs/strbuf-add-uint' into seen

2026-05-18T05:29:03Z

Adding a decimal integer with strbuf_addf("%u") appears commonly; they have been optimized by using a custom formatter. Comments? * rs/strbuf-add-uint: ls-tree: use strbuf_add_uint() ls-files: use strbuf_add_uint() cat-file: use strbuf_add_uint() strbuf: add strbuf_add_uint()

Merge branch 'kk/merge-octopus-optim' into seen

2026-05-18T05:29:03Z

The logic to determine that branches in an octopus merge are independent has been optimized. Comments? * kk/merge-octopus-optim: merge: use repo_in_merge_bases for octopus up-to-date check

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