From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carl Worth Subject: Re: missing git features (was: Re: Errors GITtifying GCC and Binutils) Date: Fri, 24 Mar 2006 08:44:20 -0800 Message-ID: <871wwrztaz.wl%cworth@cworth.org> References: <20060322133337.GU20746@lug-owl.de> <44223B90.3040500@zytor.com> <1143128751.6850.35.camel@neko.keithp.com> <20060324123238.GA3070@linux-mips.org> <4423ED16.9080504@op5.se> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Fri_Mar_24_08:44:19_2006-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Mar 24 17:47:02 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FMpR2-0000Ed-L4 for gcvg-git@gmane.org; Fri, 24 Mar 2006 17:46:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932461AbWCXQqq (ORCPT ); Fri, 24 Mar 2006 11:46:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932464AbWCXQqq (ORCPT ); Fri, 24 Mar 2006 11:46:46 -0500 Received: from mx1.redhat.com ([66.187.233.31]:4237 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S932461AbWCXQqp (ORCPT ); Fri, 24 Mar 2006 11:46:45 -0500 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k2OGkfTT029468; Fri, 24 Mar 2006 11:46:41 -0500 Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12]) by int-mx1.corp.redhat.com (8.12.11.20060308/8.11.6) with ESMTP id k2OGkb89028286; Fri, 24 Mar 2006 11:46:41 -0500 Received: from raht.cworth.org (sebastian-int.corp.redhat.com [172.16.52.221]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k2OGkZOG014972; Fri, 24 Mar 2006 11:46:36 -0500 To: Andreas Ericsson In-Reply-To: <4423ED16.9080504@op5.se> User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --pgp-sign-Multipart_Fri_Mar_24_08:44:19_2006-1 Content-Type: text/plain; charset=US-ASCII On Fri, 24 Mar 2006 13:59:02 +0100, Andreas Ericsson wrote: > See how Junio does with next and pu and recommend your users to do the > same. There's no way of pulling a rebased branch, because the rebasing > destroys ancestry information, meaning the original commits other people > have cease to exist in your repository. But the "other people" still have those commits, so it should be rather straightforward for a tool to also perform a rebase for them when doing this kind of "rebased pull". I think there's just a single arc of data missing showing where a rebased commit object came from. So this sounds solvable, and it is something I would very much enjoy having, (call me funny, but I prefer to rebase and avoid a merge commit when looking at independent lines of development for which logically there shouldn't be any "merge" required). -Carl --pgp-sign-Multipart_Fri_Mar_24_08:44:19_2006-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQBEJCHk6JDdNq8qSWgRAuBJAJ9Tu2ubkA0tydMTddUCrvduS7JVpgCdFhKb fAGMamNxIoz+6sTsiy9Yf/I= =Jdwb -----END PGP SIGNATURE----- --pgp-sign-Multipart_Fri_Mar_24_08:44:19_2006-1--