From: Avi Kivity Date: Sun, 11 Mar 2007 20:31:15 GMT Subject: Re: git merge and merge message Message-ID: <45F46713.6030702@qumranet.com> In-Reply-To: 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. -- Do not meddle in the internals of kernels, for they are subtle and quick to panic.