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

Re: Log message printout cleanups

From
Junio C Hamano <junkio@cox.net>
Date
Apr 18, 2006, 00:22 UTC
Message-ID
<7vejzvka09.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0604171647380.3701@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 9 quoted lines
> I suspect it would be better to just have the _first_ 
> diffstat, and always make the merge diffstat be the one for "result 
> against first parent".
>
> I realize that Dscho has been looking at some much "fancier" merge 
> diffstats, but I really do believe that the "what got merged" difference 
> to the original branch (ie parent 1) is what you want in practice.
>
> Anyway, that's a totally separate issue, I'll let you guys fight that out.

I agree with your opinion 100% from usability point of view, although I admit one of the fancier format was suggested by me.

Showing stat from the first parent makes --stat inconsistent from what the "fake diff" shows, but I think it is a sensible thing to do. The purpose of two are different in that (1) stat is a way to see the extent of damage to what you had before you merged, and (2) --cc is a way to see how complex the merge was, to spot obvious merge mistakes and sanity check the merge at the contents level.

Previous: Linus TorvaldsNext: Junio C Hamano
Message 10 of 18 in “Fixes for option parsing”
  1. Linus TorvaldsApr 16, 2006
  2. Junio C HamanoApr 17, 2006
  3. Linus TorvaldsApr 17, 2006
  4. Linus TorvaldsApr 17, 2006
  5. Junio C HamanoApr 17, 2006
  6. Linus TorvaldsApr 17, 2006
  7. Log message printout cleanupsLinus Torvalds, Apr 17, 2006
  8. Junio C HamanoApr 17, 2006
  9. Linus TorvaldsApr 17, 2006
  10. Junio C HamanoApr 18, 2006
  11. Junio C HamanoApr 18, 2006
  12. Linus TorvaldsApr 18, 2006
  13. Junio C HamanoApr 18, 2006
  14. Linus TorvaldsApr 18, 2006
  15. Linus TorvaldsApr 18, 2006
  16. Junio C HamanoApr 18, 2006
  17. diff --stat: make sure to set recursive.Junio C Hamano, Apr 18, 2006
  18. Linus TorvaldsApr 18, 2006

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.