From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 11 Mar 2007 21:41:48 GMT
Subject: Re: git merge and merge message
Message-ID: <Pine.LNX.4.63.0703112241040.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <45F46713.6030702@qumranet.com>

Hi,

On Sun, 11 Mar 2007, Avi Kivity wrote:

> Linus Torvalds wrote:
> > 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.

What? You should sign-off on stuff you did not review? Or do you review 
the stuff _before_ merging? I don't.

Ciao,
Dscho