]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c8b4805) | patch
merge: don't document non-existing --compact-summary argument
authorRené Scharfe <l.s.r@web.de>
Sat, 9 Aug 2025 10:00:16 +0000 (12:00 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Aug 2025 00:11:19 +0000 (17:11 -0700)
commitad459fd44cf43fe8e506f9c72c54a69407ffcb13
tree79cd840daab46c275605989df45830da8443588ctree
parentc8b4805897aa12305389c76480e1d59c4696f2accommit | diff
merge: don't document non-existing --compact-summary argument

3a54f5bd5d (merge/pull: add the "--compact-summary" option, 2025-06-12)
added the option --compact-summary to both merge and pull.  It takes no
no argument, but for merge it got an argument help string.  Remove it,
since it is unnecessary.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.