From: Junio C Hamano Date: Tue, 24 Jul 2007 21:43:27 GMT Subject: Re: [PATCH] Teach git-commit about commit message templates. Message-ID: <7v3azdh400.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <46A5EA2D.1030707@midwinter.com> Steven Grimm writes: > Junio C Hamano wrote: > ... >> I am more worried about how this should interact with cases >> where you usually do not start the log message from scratch. >> For example, are there cases / policies where being able to use >> templates to leave comments on merge commits are needed? >> Squash-commits? Perhaps "apply this template but only when you >> have hand resolved a conflicting merges"? >> > > Those are all valid cases. They also happen to be ones that are not > personally useful to me; none of the stuff in my company's commit > template would really apply to merges. I'm happy to do it if you think > those cases need to be handled before this can go in, but given > there's at least one user out there who doesn't need those things, I > wonder if this makes more sense to hold off on until someone actually > asks for it. > ... > Is your hunch about the common case different than mine? Again, I can > go address this if it'll actually be useful. No, I am way more cunning and lazy than that. I did not have hunch about the common case, so I just had you (and anybody else who would join the thread) do necessary thinking and guessing for me ;-)