]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10fa89a ad459fd)
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)
Hotfix.

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

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.