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

Re: [PATCH] disable merge summaries if they are disabled

From
Junio C Hamano <junkio@cox.net>
Date
May 23, 2007, 20:03 UTC
Message-ID
<7vd50r2tpa.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20070523195823.GA2554@steel.home>
Alex Riesen <raa.lkml@gmail.com> writes:
Show 14 quoted lines
> Junio C Hamano, Wed, May 23, 2007 20:22:57 +0200:
>> "Alex Riesen" <raa.lkml@gmail.com> writes:
>> 
>> > Otherwise the merge.summary option has no visible effect.
>> 
>> I suspect you are mistaking a different merge summary.  The
>> option affects fmt-merge-msg, iow, the shortlog looking summary
>> that appears as the commit message in a merge commit.
>> 
>> The command line parameter --no-summary inhibits the diffstat
>> given to the terminal after "git-pull/git-merge" is made.
>> 
>
> I did it again, didn't I?! :)

You could argue that it is not your fault but is a faulty and misleading documentation, if you supply a patch to clarify it ;-).

Previous: Alex Riesen
Message 9 of 9 in “disable merge summaries if they are disabled”
  1. disable merge summaries if they are disabledAlex Riesen, May 23, 2007
  2. Alex RiesenMay 23, 2007
  3. Junio C HamanoMay 23, 2007
  4. Alex RiesenMay 23, 2007
  5. Add a configuration option to control diffstat after mergeAlex Riesen, May 23, 2007
  6. Junio C HamanoMay 23, 2007
  7. Alex RiesenMay 23, 2007
  8. Add a configuration option to control diffstat after mergeAlex Riesen, May 23, 2007
  9. Junio C HamanoMay 23, 2007

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.