From: Junio C Hamano <gitster@pobox.com>
To: "D. Ben Knoble" <ben.knoble@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge/pull: --compact-summary
Date: Tue, 10 Jun 2025 20:12:32 -0700 [thread overview]
Message-ID: <xmqqzfefj7j3.fsf@gitster.g> (raw)
In-Reply-To: <CALnO6CCnjP2XnCw1CwyXztkHHMv-U4zrvf8_m2X4-isvPL3ygg@mail.gmail.com> (D. Ben Knoble's message of "Tue, 10 Jun 2025 17:16:29 -0400")
"D. Ben Knoble" <ben.knoble@gmail.com> writes:
> Does this suggest that we either want a "diff options" option (or
> config), which would be more general?
If I have bk/new-topic branch, here is how I would merge it.
$ git merge --compact-summary bk/new-topic
but there is an existing merge.stat that (1) is a mere boolean and
(2) is true by default to force use of "--stat" option. We could
extend it to "bool or the string 'compact-summary'" and when it is
- not set, do the "--stat" as before;
- set to true, do the "--stat" as before;
- set to 'compact-summary', do the "--compact-summary".
With such a configuration variable, "git merge bk/new-topic" would
be how I would run my merge.
next prev parent reply other threads:[~2025-06-11 3:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-08 16:05 [PATCH] merge/pull: --compact-summary Junio C Hamano
2025-06-10 21:16 ` D. Ben Knoble
2025-06-11 3:12 ` Junio C Hamano [this message]
2025-06-11 23:26 ` D. Ben Knoble
2025-06-11 17:00 ` [PATCH 2/1] merge/pull: extend merge.stat configuration variable to cover --compact-summary Junio C Hamano
2025-06-11 17:12 ` Eric Sunshine
2025-06-11 17:29 ` Junio C Hamano
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=xmqqzfefj7j3.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ben.knoble@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.