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, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Junio C Hamano Subject: Re: [PATCH] git-merge: make it usable as the first class UI Date: Mon, 20 Nov 2006 11:52:30 -0800 Message-ID: <7vr6vx28w1.fsf@assigned-by-dhcp.cox.net> References: <200611201700.kAKH0msM012002@laptop13.inf.utfsm.cl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii NNTP-Posting-Date: Mon, 20 Nov 2006 19:53:00 +0000 (UTC) Cc: git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org In-Reply-To: <200611201700.kAKH0msM012002@laptop13.inf.utfsm.cl> (Horst H. von Brand's message of "Mon, 20 Nov 2006 14:00:48 -0300") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) 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 1GmFC2-0000y4-6H for gcvg-git@gmane.org; Mon, 20 Nov 2006 20:52:38 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966594AbWKTTwc (ORCPT ); Mon, 20 Nov 2006 14:52:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S966596AbWKTTwc (ORCPT ); Mon, 20 Nov 2006 14:52:32 -0500 Received: from fed1rmmtao02.cox.net ([68.230.241.37]:36569 "EHLO fed1rmmtao02.cox.net") by vger.kernel.org with ESMTP id S966594AbWKTTwc (ORCPT ); Mon, 20 Nov 2006 14:52:32 -0500 Received: from fed1rmimpo01.cox.net ([70.169.32.71]) by fed1rmmtao02.cox.net (InterMail vM.6.01.06.03 201-2131-130-104-20060516) with ESMTP id <20061120195231.EPUO97.fed1rmmtao02.cox.net@fed1rmimpo01.cox.net>; Mon, 20 Nov 2006 14:52:31 -0500 Received: from assigned-by-dhcp.cox.net ([68.5.247.80]) by fed1rmimpo01.cox.net with bizsmtp id p7s21V00H1kojtg0000000; Mon, 20 Nov 2006 14:52:02 -0500 To: "Horst H. von Brand" Sender: git-owner@vger.kernel.org "Horst H. von Brand" writes: >> Most notably, $commit above can be any committish, so you can >> say for example: >> >> git merge js/shortlog~2 >> >> to merge early part of a topic branch without merging the rest >> of it. > > "Early part", i.e., branch js/shortlog up to js/shortlog~2 or just that one > commit? "Early part up to that commit" -- this is not a cherry pick. >> A custom merge message can be given with the new --message= >> parameter. The message is prepended in front of the usual >> "Merge ..." message autogenerated with fmt-merge-message. > > Why not -m too (consistency!)? That form also is accepted, I think.