]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'rs/merge-compact-summary'
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Aug 2025 04:30:16 +0000 (21:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Aug 2025 04:30:16 +0000 (21:30 -0700)
commit22dd6abc321b49e7c785eb2e1fb6a6a9771dd18c
tree84f805f240d9adb2faf97550de340ac62374cdcf
parent10fa89aadcc022babf0b60e0a67a2d2661af768d
parentad459fd44cf43fe8e506f9c72c54a69407ffcb13
Merge branch 'rs/merge-compact-summary'

Hotfix.

* rs/merge-compact-summary:
  merge: don't document non-existing --compact-summary argument
builtin/merge.c