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.4 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,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: [PATCH] Documentation: Transplanting branch with git-rebase --onto Date: Tue, 7 Nov 2006 00:14:20 +0100 Message-ID: <200611070014.20607.jnareb@gmail.com> References: <200611042205.58212.jnareb@gmail.com> <200611061912.46436.jnareb@gmail.com> <7v4ptcchli.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Mon, 6 Nov 2006 23:14:02 +0000 (UTC) Cc: git@vger.kernel.org, Carl Worth Return-path: Envelope-to: gcvg-git@gmane.org DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:subject:date:user-agent:cc:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=RoSbCci56amk+h/0YhLsGW83d/W/W2BUL+V5NsW/t2wcehqrW9FlM4yyHVq1Lfg5PpmnhBNH4hNPDqqXYtyl2OGMc3vuxq0YhLCpsgsbAccv4lJttLYjm0pFglccGHKAo1wwV/z/Uh+ZVY9gNHbfO3rdrzSpRmKBSpUMg3X3OJg= User-Agent: KMail/1.9.3 In-Reply-To: <7v4ptcchli.fsf@assigned-by-dhcp.cox.net> Content-Disposition: inline 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 1GhDf4-0000IO-RP for gcvg-git@gmane.org; Tue, 07 Nov 2006 00:13:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753914AbWKFXNq (ORCPT ); Mon, 6 Nov 2006 18:13:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753915AbWKFXNq (ORCPT ); Mon, 6 Nov 2006 18:13:46 -0500 Received: from ug-out-1314.google.com ([66.249.92.175]:36334 "EHLO ug-out-1314.google.com") by vger.kernel.org with ESMTP id S1753914AbWKFXNp (ORCPT ); Mon, 6 Nov 2006 18:13:45 -0500 Received: by ug-out-1314.google.com with SMTP id m3so1042214ugc for ; Mon, 06 Nov 2006 15:13:43 -0800 (PST) Received: by 10.67.97.7 with SMTP id z7mr8151925ugl.1162854823409; Mon, 06 Nov 2006 15:13:43 -0800 (PST) Received: from host-81-190-24-209.torun.mm.pl ( [81.190.24.209]) by mx.google.com with ESMTP id q40sm5618603ugc.2006.11.06.15.13.42; Mon, 06 Nov 2006 15:13:43 -0800 (PST) To: Junio C Hamano Sender: git-owner@vger.kernel.org Junio C Hamano wrote: > Jakub Narebski writes: > >> Added example of transplantig feature branch from one development >> branch (for example "next") into the other development branch (for >> example "master"). >> >> [jn: with a little help from Junio] >> >> Signed-off-by: Jakub Narebski >> --- >> What about this? > > I agree with Carl that the original example of --onto was not > clear why it is a good thing, so I am inclined to follow his > suggestion and drop the original example and keep your second > one yanked from your try#1 patch when committing, if it is Ok > with you. That's O.K. by me. Perhaps you can add the info that git-rebase with argument switches to given branch (is equivalent to checkout + rebase without argument). P.S. The "transplanting from 'next' to 'master'" example was taken from your mail, Junio: Message-ID: <7vlkrfoaky.fsf@assigned-by-dhcp.cox.net> http://permalink.gmane.org/gmane.comp.version-control.git/22923 -- Jakub Narebski