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

Re: git merge and merge message

From
AKAvi Kivity <avi@qumranet.com>
Date
Mar 11, 2007, 20:31 UTC
Message-ID
<45F46713.6030702@qumranet.com>
In-Reply-To
<Pine.LNX.4.64.0703111309410.9690@woody.linux-foundation.org>
Linus Torvalds wrote:
Show 7 quoted lines
> Comments? Do people think it would be a good idea to do
>
> 	git merge --no-fast-forward -m "Merge feature Xyz" xyz-branch
>
> as an option?
>
>

Actually there's at least one tree where this should be activated -- yours. If you perform a fast-forward merge, there's no record of the merge, no record of which tree was pulled, and no sign-off from you. The commits just appear there. It partially defeats the sign-off system.

This feature would be good for top-level trees and for major subsystem trees IMO.

-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
Previous: Linus TorvaldsNext: Linus Torvalds
Message 6 of 15 in “git merge and merge message”
  1. Xavier MaillardMar 11, 2007
  2. J. Bruce FieldsMar 11, 2007
  3. git-merge: warn when -m provided on a fast forwardJ. Bruce Fields, Mar 11, 2007
  4. Xavier MaillardMar 11, 2007
  5. Linus TorvaldsMar 11, 2007
  6. Avi KivityMar 11, 2007
  7. Linus TorvaldsMar 11, 2007
  8. Avi KivityMar 12, 2007
  9. Johannes SchindelinMar 11, 2007
  10. Junio C HamanoMar 12, 2007
  11. Avi KivityMar 12, 2007
  12. Junio C HamanoMar 11, 2007
  13. [RFC] git log --first-parentJunio C Hamano, Mar 13, 2007
  14. Jeff KingMar 13, 2007
  15. Martin LanghoffMar 12, 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.