git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] merge/pull: --compact-summary

From
D. Ben Knoble <ben.knoble@gmail.com>
Date
Jun 11, 2025, 23:26 UTC
Message-ID
<CALnO6CCrCcEp1FWWWPQ2fts-n-jHZdfYWsyYsG9W5aUV42gs8Q@mail.gmail.com>
In-Reply-To
<xmqqzfefj7j3.fsf@gitster.g>
On Tue, Jun 10, 2025 at 11:12 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 20 quoted lines
>
> "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.

Makes sense; I suppose my question was more along the lines of "should we go ahead and support extending the options we give to diff more broadly rather than add a one-off flag (and potentially add more later)."

-- 
D. Ben Knoble
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 7 in “merge/pull: --compact-summary”
  1. merge/pull: --compact-summaryJunio C Hamano, Jun 8, 2025
  2. D. Ben KnobleJun 10, 2025
  3. Junio C HamanoJun 11, 2025
  4. D. Ben KnobleJun 11, 2025
  5. 2/1 merge/pull: extend merge.stat configuration variable to cover --compact-summaryJunio C Hamano, Jun 11, 2025
  6. Eric SunshineJun 11, 2025
  7. Junio C HamanoJun 11, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.