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

merge summaries

From
Steffen Prohaska <prohaska@zib.de>
Date
May 18, 2007, 05:44 UTC
Message-ID
<25A3C618-8D12-42A8-9478-D3A4E7633CE7@zib.de>

It took me some time to figure out how to get summaries of the merged branch into merge messages. Finally I recognized that I simply need to set

	git-config merge.summary true
I have two questions:
1) Why isn't 'true' the default setting? The two probably most  
prominent git repositories, git and kernel, both use merge summaries.  
After some time working with git I started to wonder, how these guys  
create the nicely formatted branch summaries. If merge summaries are  
apparently best practice, why are they missing in my local merges?
2) Why does git-merge have a switch '--no-summary' to switch  
summaries off, but doesn't have a switch '--summary' to switch them  
on? After some time of searching for the solution I started to  
believe that Linus and Junio might use some shell magic to create  
their merge messages, which they pipe to git-merge's -m switch. This  
inconsistency made finding the simple solution even harder.
- Steffen
Next: Linus Torvalds
Message 1 of 18 in “merge summaries”
  1. Steffen ProhaskaMay 18, 2007
  2. Linus TorvaldsMay 18, 2007
  3. Junio C HamanoMay 18, 2007
  4. Linus TorvaldsMay 18, 2007
  5. J. Bruce FieldsMay 18, 2007
  6. Linus TorvaldsMay 18, 2007
  7. Junio C HamanoMay 18, 2007
  8. Robin RosenbergMay 20, 2007
  9. rev-list: '--indent' oneline outputSteffen Prohaska, May 20, 2007
  10. Steffen ProhaskaMay 20, 2007
  11. Junio C HamanoMay 20, 2007
  12. Steffen ProhaskaMay 20, 2007
  13. Steffen ProhaskaMay 19, 2007
  14. Junio C HamanoMay 19, 2007
  15. Junio C HamanoMay 19, 2007
  16. Steffen ProhaskaMay 20, 2007
  17. Junio C HamanoMay 20, 2007
  18. Junio C HamanoMay 20, 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.