From: Jay Soffian Date: Mon, 19 Jul 2010 17:23:06 GMT Subject: Re: Merge commit subjects git.git Message-ID: In-Reply-To: <7vpqyjph4x.fsf@alter.siamese.dyndns.org> On Mon, Jul 19, 2010 at 12:31 PM, Junio C Hamano wrote: > The merge messages that are autogenerated by "git merge" (rather, "git > fmt-merge-msg") are optimized for Linus's workflow ;-) and hasn't changed > much during the past 4-5 years. Ah, thank you for the explanation. > I almost never use "-s ours"; the only exception is when fixing mistakes, > and "merging all the fixes that accumulated on 'maint' to 'master'" is > certainly not an example of "fixing mistakes". > > This "Sync with 1.7.1.1" is an example of me using "commit --amend" to > note the exact reason why this merge of 'maint' to 'master' was made---"to > make sure that we have all the fix in the last maintenance release in the > development version".  Because the fixes to 1.7.1.1 were all cooked first > in "master" and then merged to "maint", the result of this particular > merge didn't change the tree of "master", but that is not always the case. Can you explain a bit about how you manage the DEF_VER variable in GIT-VERSION-GEN? I think I was confused not to see GIT-VERSION-GEN listed as a conflict in the merge message, but looking more carefully I see that the files with embedded versions did indeed conflict. Do you just edit this out of the merge message? j.