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

Re: git merge and merge message

From
Junio C Hamano <junkio@cox.net>
Date
Mar 12, 2007, 02:03 UTC
Message-ID
<7vfy8busjv.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.63.0703112241040.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 5 quoted lines
>> This feature would be good for top-level trees and for major subsystem 
>> trees IMO.
>
> What? You should sign-off on stuff you did not review? Or do you review 
> the stuff _before_ merging? I don't.

Actually I've done a few merging recently, and I do review the stuff before merging. It is easier to review after making a merge, so technically the review happens _after_ merging but if I do not like what the other branch has, I can throw it away with "reset --hard ORIG_HEAD", which means in practice the review is done before.

Previous: Johannes SchindelinNext: Avi Kivity
Message 10 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.