From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Pitre Subject: Re: What's cooking in git.git (topics) Date: Sun, 25 Nov 2007 23:29:56 -0500 (EST) Message-ID: References: <7vabpctx3b.fsf@gitster.siamese.dyndns.org> <7vsl30eyuk.fsf@gitster.siamese.dyndns.org> <7vve7tuz3a.fsf@gitster.siamese.dyndns.org> <20071123103003.GB6754@sigill.intra.peff.net> <20071124113814.GA17861@sigill.intra.peff.net> <7vtznbqx2w.fsf@gitster.siamese.dyndns.org> <20071125215128.GC23820@fieldses.org> <20071126041521.GA21120@fieldses.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: Junio C Hamano , Jeff King , Johannes Schindelin , git@vger.kernel.org To: "J. Bruce Fields" X-From: git-owner@vger.kernel.org Mon Nov 26 05:30:26 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IwVc0-000756-Pz for gcvg-git-2@gmane.org; Mon, 26 Nov 2007 05:30:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756212AbXKZE36 (ORCPT ); Sun, 25 Nov 2007 23:29:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754850AbXKZE36 (ORCPT ); Sun, 25 Nov 2007 23:29:58 -0500 Received: from relais.videotron.ca ([24.201.245.36]:32593 "EHLO relais.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754517AbXKZE35 (ORCPT ); Sun, 25 Nov 2007 23:29:57 -0500 Received: from xanadu.home ([74.56.106.175]) by VL-MH-MR001.ip.videotron.ca (Sun Java(tm) System Messaging Server 6.3-4.01 (built Aug 3 2007; 32bit)) with ESMTP id <0JS300HJ2J5WY4F0@VL-MH-MR001.ip.videotron.ca> for git@vger.kernel.org; Sun, 25 Nov 2007 23:29:56 -0500 (EST) X-X-Sender: nico@xanadu.home In-reply-to: <20071126041521.GA21120@fieldses.org> User-Agent: Alpine 0.99999 (LFD 814 2007-11-14) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, 26 Nov 2007, J. Bruce Fields wrote: > I do find that trying to work on top of a constantly rebased branch is > annoying no matter how I do it. So I sometimes wonder if we shouldn't > instead be finding ways to avoid the practice. I don't think it can't be avoided in many cases. Some stuff gets rebased because it has to be refined before it is merged in a more stable and more "official" repository. Working on top of a rebased branch could be much easier if there was a dedicated command to perform the local rebase of one's work after a fetch, just like the pull command does a merge after a fetch, at which point both work flows would be almost equivalent wrt ease of use. Nicolas