From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jay Soffian Subject: Re: Merge commit subjects git.git Date: Mon, 19 Jul 2010 13:23:06 -0400 Message-ID: References: <7vpqyjph4x.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Jul 19 19:23:20 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Oau3f-0007yd-2i for gcvg-git-2@lo.gmane.org; Mon, 19 Jul 2010 19:23:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760753Ab0GSRXK convert rfc822-to-quoted-printable (ORCPT ); Mon, 19 Jul 2010 13:23:10 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:42594 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760724Ab0GSRXH convert rfc822-to-8bit (ORCPT ); Mon, 19 Jul 2010 13:23:07 -0400 Received: by iwn7 with SMTP id 7so4785401iwn.19 for ; Mon, 19 Jul 2010 10:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=Qpk3vvTLsUJyRqrwuyZe0KX0EdcV3MUk4mTXNxnP/FQ=; b=H5HI8NQdd30/Hjz6/na6drbgvNgq4HqVVtBiabmcSFrDf9eP400ca8pAmao5TPUE49 rIBSJylB1AqHae287rslht4BSEIQrCSFfAe+xkms9T8TGNx6KFN8W00HBoukoJvFWTbp ZVtaXkWTHsHGMLO51snOYZGhx/T73Kzj771Nk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Mg+qsLedmmqJAMERzyBP+0WI6G5s7WXviOsLDZcNFgFR/93cdVfOyvw2rX3KPCde1E 4J9jK94GQgYR01BreF9RtLRiwmXhyZY3rP/s4JABfkeBLEMCjHM6fVje1VXk55LQrJ+O O1kLsXcikGMT9VnclVlz4Cb0F9MwdQ2pvkKT4= Received: by 10.231.157.143 with SMTP id b15mr5933636ibx.113.1279560186907; Mon, 19 Jul 2010 10:23:06 -0700 (PDT) Received: by 10.231.152.133 with HTTP; Mon, 19 Jul 2010 10:23:06 -0700 (PDT) In-Reply-To: <7vpqyjph4x.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, Jul 19, 2010 at 12:31 PM, Junio C Hamano wr= ote: > The merge messages that are autogenerated by "git merge" (rather, "gi= t > fmt-merge-msg") are optimized for Linus's workflow ;-) and hasn't cha= nged > 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 mista= kes, > and "merging all the fixes that accumulated on 'maint' to 'master'" i= s > certainly not an example of "fixing mistakes". > > This "Sync with 1.7.1.1" is an example of me using "commit --amend" t= o > 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". =C2=A0Because the fixes to 1.7.1.1 were all coo= ked 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.