From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: Merge commit subjects git.git Date: Mon, 19 Jul 2010 09:31:58 -0700 Message-ID: <7vpqyjph4x.fsf@alter.siamese.dyndns.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git To: Jay Soffian X-From: git-owner@vger.kernel.org Mon Jul 19 18:32:17 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 1OatGK-00016u-Sl for gcvg-git-2@lo.gmane.org; Mon, 19 Jul 2010 18:32:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936423Ab0GSQcK (ORCPT ); Mon, 19 Jul 2010 12:32:10 -0400 Received: from a-pb-sasl-quonix.pobox.com ([208.72.237.25]:32804 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936407Ab0GSQcI (ORCPT ); Mon, 19 Jul 2010 12:32:08 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id 40CF8C5F8D; Mon, 19 Jul 2010 12:32:05 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=to:cc:subject :references:from:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=H4UJ1+3nkbcgZuEiwpxvBxlMIHU=; b=dzoolV uYeLClYU1IrIa/TNTGEHiE9JfWu1pw9XzB1qFtC2hQQnG9R0hpb+YzymCH0lOZFa cOaTR6qbeecNxJS2shWalcdf8Lpg7Q6QgMDrHYu4mo6N0SMJKzISGMtTFF+JOiZU G9DSiT4gjXSbmPCL6NYbCfPT7rl6uXYJ5XpT4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=to:cc:subject :references:from:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=mYDI2LzLKb24Twk+03AuAO8HoeIx7xGn eXeFZe8NjyM3SzHnie/Xb9PuNZNYwAflMCiwSd97eJ3uBKwydkJUA80dQJK+2sxx WHqSARm5JZpATvfoFiv7J80xFjwwuqzXNKVg17+1dkoWFxmjw27RLumKMsSL+m8Q RMufjhqKkRI= Received: from a-pb-sasl-quonix. (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id 1F1AEC5F8C; Mon, 19 Jul 2010 12:32:03 -0400 (EDT) Received: from pobox.com (unknown [69.181.135.33]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 5F4DDC5F87; Mon, 19 Jul 2010 12:32:00 -0400 (EDT) In-Reply-To: (Jay Soffian's message of "Sun\, 18 Jul 2010 04\:22\:25 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-Pobox-Relay-ID: 296C701E-9353-11DF-BED6-9056EE7EF46B-77302942!a-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Jay Soffian writes: > Color me curious, but why do the merge commit message in git.git > sometimes look like this: 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. > Merge branch 'jn/paginate-fix' You have _one_ primary integration branch (well, by definition, there should be only one "primary") called "master", and when you merge into that branch you are merging work done by a side branch that has been cooking. You get a terse "Merge branch x", "Merge $URL", etc. without "into". > Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix You are not supposed to merge the integration branch into topics without a very good reason. Again, because by default the tool assumes you have one primary integration branch, merging into a branch that is not "master" gets "into ..." so that it will later stand out in the output of "git log" and "git shortlog". I sometimes/often add some comments explaining why I needed the merge to such a merge with "commit --amend" (the particular one you noticed, jc/read-tree-cache-tree-fix, doesn't have it but I should have. The topic was about fixing an ancient bug and I wanted an early conflict resolution before bringing the fix to more up-to-date codebase). > Also, the "Sync with 1.7.1.1" merges are I guess are from something like: > > git merge -s ours -m "Sync with 1.7.1.1" maint 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.