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

Re: [PATCH v2 1/2] merge/pull: --compact-summary

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 13, 2025, 16:26 UTC
Message-ID
<xmqq5xgza9qt.fsf@gitster.g>
In-Reply-To
<857ea4d4-2252-4d46-9f93-e78e9450bb8c@app.fastmail.com>
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:
Show 13 quoted lines
> On Fri, Jun 13, 2025, at 00:25, Junio C Hamano wrote:
>>  static struct option builtin_merge_options[] = {
>>  	OPT_SET_INT('n', NULL, &show_diffstat,
>>  		N_("do not show a diffstat at the end of the merge"), 0),
>>  	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"),
>> +		       N_("show a compactstat at the end of the merge"),
>> +		       PARSE_OPT_NOARG,
>> +		       option_parse_compact_summary),
>
> `compactstat` is very dense.  s/compactstat/compact stat/ ?

Nice spotting. I think "compact summary" (to match the diff option "--compact-summary") may be even better.

Previous: Kristoffer HaugsbakkNext: Junio C Hamano
Message 4 of 7 in “git pull/merge --compact-summary”
  1. 0/2 git pull/merge --compact-summaryJunio C Hamano, Jun 12, 2025
  2. 1/2 merge/pull: --compact-summaryJunio C Hamano, Jun 12, 2025
  3. Kristoffer HaugsbakkJun 13, 2025
  4. Junio C HamanoJun 13, 2025
  5. 2/2 merge/pull: extend merge.stat configuration variable to cover --compact-summaryJunio C Hamano, Jun 12, 2025
  6. Kristoffer HaugsbakkJun 13, 2025
  7. Junio C HamanoJun 13, 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.