From: Avi Kivity Date: Mon, 12 Mar 2007 17:31:11 GMT Subject: Re: git merge and merge message Message-ID: <45F58E5F.5070000@qumranet.com> In-Reply-To: Johannes Schindelin wrote: >>> >>> >> 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. > Obviously one signs off only after some sort of review. Some merges might be reviewed line-by-line, and some might be reviewed by looking at the maintainer's name and shortlog for a sanity check, but obviously you don't pull blind. Anyway currently whether a merge record and a sign-off appear is a fairly random decision, based on the time of the last rebase the pullee did. Whichever way is chosen (record/no record) I don't think it should be based on that. -- error compiling committee.c: too many arguments to function