From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Jakub Narebski Subject: Re: Feature request: git-pull -e/--edit Date: Mon, 20 Nov 2006 09:02:16 +0100 Organization: At home Message-ID: References: <7vy7q67tf2.fsf@assigned-by-dhcp.cox.net> <20061120024308.18620.qmail@science.horizon.com> <7v8xi67qhq.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-2 Content-Transfer-Encoding: QUOTED-PRINTABLE NNTP-Posting-Date: Mon, 20 Nov 2006 08:01:27 +0000 (UTC) Return-path: Envelope-to: gcvg-git@gmane.org X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 48 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: host-81-190-24-209.torun.mm.pl Mail-Copies-To: jnareb@gmail.com User-Agent: KNode/0.10.2 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gm45j-00055q-2U for gcvg-git@gmane.org; Mon, 20 Nov 2006 09:01:23 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933753AbWKTIBJ convert rfc822-to-quoted-printable (ORCPT ); Mon, 20 Nov 2006 03:01:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933684AbWKTIBI (ORCPT ); Mon, 20 Nov 2006 03:01:08 -0500 Received: from main.gmane.org ([80.91.229.2]:33733 "EHLO ciao.gmane.org") by vger.kernel.org with ESMTP id S933753AbWKTIBH (ORCPT ); Mon, 20 Nov 2006 03:01:07 -0500 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Gm45H-0004za-K3 for git@vger.kernel.org; Mon, 20 Nov 2006 09:00:55 +0100 Received: from host-81-190-24-209.torun.mm.pl ([81.190.24.209]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 20 Nov 2006 09:00:55 +0100 Received: from jnareb by host-81-190-24-209.torun.mm.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 20 Nov 2006 09:00:55 +0100 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Junio C Hamano wrote: > So if we rename the current "git merge" to "git-merge--record" or git-merge-driver > (or any name "git pull" uses internally to record the merge > commit), and make "git merge" a synonym to "git pull .", and > give a command line option -m to "git pull" to _affect_ the > resulting merge message, I would think everybody would become > quite happy. =A0It means: >=20 > =A0- People can say "git merge this-branch" (which is internally > =A0 =A0translated to "git pull . this-branch"); >=20 > =A0- People can say "git pull -m 'I am doing this merge for such > =A0 =A0and such reason' $URL $branch" to _include_ that message in > =A0 =A0the resulting merge commit; >=20 > =A0- The same can be said about "git merge -m 'comment' $branch". >=20 > I said _affect_ and _include_ in the above because I suspect > that most of the time you do not want to _replace_ the > autogenerated part ("Merge branch of repo", and if you are > pulling from your subordinate trees the merge summary message as > well). I'm all for adding -m option to git-pull (and perhaps also common other message generation options: -F , --edit). I'm even for addi= ng -m option to git-merge.=20 Making "git merge" to be a synonym to "git pull ."... I'm not so sure. I'd rather we don't lose the ability to give arbitrary refs ar "other" heads like in git merge "Merge early part of branch 'topicA'" HEAD topicA~3 example, and ability (if there is such ability) to not include HEAD (cu= rrent version of branch) as first parent like in git checkout pu git merge "Merge branch 'topicA', 'topicB'" topicA topicB --=20 Jakub Narebski Warsaw, Poland ShadeHawk on #git