From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] merge: don't document non-existing --compact-summary argument
Date: Sat, 09 Aug 2025 17:07:32 -0700 [thread overview]
Message-ID: <xmqqa54859a3.fsf@gitster.g> (raw)
In-Reply-To: <890631d1-4e3e-4ea5-8f58-371fadf2b1b3@web.de> ("René Scharfe"'s message of "Sat, 9 Aug 2025 12:00:16 +0200")
René Scharfe <l.s.r@web.de> writes:
> 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.
Thanks.
>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> builtin/merge.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index dc4cb8fb14..ce880e6ccb 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = {
> OPT_BOOL(0, "stat", &show_diffstat,
> N_("show a diffstat at the end of the merge")),
> OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")),
> - OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, N_("compact-summary"),
> + OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, NULL,
> N_("show a compact-summary at the end of the merge"),
> PARSE_OPT_NOARG,
> option_parse_compact_summary),
prev parent reply other threads:[~2025-08-10 0:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-09 10:00 [PATCH] merge: don't document non-existing --compact-summary argument René Scharfe
2025-08-10 0:07 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa54859a3.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).