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=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: Carl Worth Subject: Re: [PATCH/RFC] Documentation: Two more git-rebase --onto examples Date: Mon, 06 Nov 2006 10:14:45 -0800 Message-ID: <87zmb4v3vu.wl%cworth@cworth.org> References: <200611042205.58212.jnareb@gmail.com> <7vbqnmwvib.fsf@assigned-by-dhcp.cox.net> <200611051122.17623.jnareb@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Mon_Nov__6_10:14:39_2006-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Mon, 6 Nov 2006 18:39:15 +0000 (UTC) Cc: Junio C Hamano , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org In-Reply-To: <200611051122.17623.jnareb@gmail.com> User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) 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 1Gh903-0006im-BC for gcvg-git@gmane.org; Mon, 06 Nov 2006 19:15:11 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753665AbWKFSPG (ORCPT ); Mon, 6 Nov 2006 13:15:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753753AbWKFSPG (ORCPT ); Mon, 6 Nov 2006 13:15:06 -0500 Received: from theworths.org ([217.160.253.102]:40878 "EHLO theworths.org") by vger.kernel.org with ESMTP id S1753665AbWKFSPF (ORCPT ); Mon, 6 Nov 2006 13:15:05 -0500 Received: (qmail 14913 invoked from network); 6 Nov 2006 13:15:02 -0500 Received: from localhost (HELO raht.cworth.org) (127.0.0.1) by localhost with SMTP; 6 Nov 2006 13:15:02 -0500 To: Jakub Narebski Sender: git-owner@vger.kernel.org --pgp-sign-Multipart_Mon_Nov__6_10:14:39_2006-1 Content-Type: text/plain; charset=US-ASCII On Sun, 5 Nov 2006 11:22:17 +0100, Jakub Narebski wrote: > I found original example somewhat artifical, but after thinking on that > I guess that the need for rebase onto master~1 might happen when the last > commit in master is for example to be amended or rebased. It is quite artificial in presentation at least. There's no motivating explanation of what is being attempted just before-and-after diagrams along with a command that achieves the result. That presentation makes it very hard to learn how to usefully use the command from the description. > > This looks the same as the original example for --onto; I would > > either drop it or replace it something of different flavor. > > This example is from latest post by Andy Parkins, which asked how to > do that. But I find your example as being better, because it shows > even more power of core git history manipulation. I think Jakub's explanations do a much better job of explaining something someone might actually want to do and then showing how to do it. So if there's redundancy I'd vote for dropping the old stuff. Meanwhile, while we're talking about git-rebase documentation, the recent posts about the: git rebase --onto form take advantage of the fact that this command also changes the current branch to . I think that's quite surprising behavior, (though useful in the example that was given). It's perhaps out of line with the scope of git-rebase but it should at least be documented. I think that will need some specific mention before the examples. -Carl --pgp-sign-Multipart_Mon_Nov__6_10:14:39_2006-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQBFT3uV6JDdNq8qSWgRAu9KAJ9V6bnEp3hWx9eCTqxoLBUAZtS1zwCgm3Ev HWQz+sZZ4OyT63eEGUnv1GY= =wvTm -----END PGP SIGNATURE-----