Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161084AbWAHTTw (ORCPT ); Sun, 8 Jan 2006 14:19:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161101AbWAHTTw (ORCPT ); Sun, 8 Jan 2006 14:19:52 -0500 Received: from wproxy.gmail.com ([64.233.184.203]:7241 "EHLO wproxy.gmail.com") by vger.kernel.org with ESMTP id S1161086AbWAHTTu convert rfc822-to-8bit (ORCPT ); Sun, 8 Jan 2006 14:19:50 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=e/O7xCaZvulBG3YPXEE5HsUtnLDn9LlKoO+ksT2Vb9QXvhiB7aIMIGTZ0VDB4ME8haKpLfXfe+ZXqt1f8yws6m86UaCDtXyO8wGcqYmQ6OINJWvQWSxvWkfX3cXpnNqSOKZ4JS3GSlwaqMZzLZyHoLBBmNs/PS7Owd3UxOwd4yc= Message-ID: <46a038f90601081119r39014fbi995cc8b6e95774da@mail.gmail.com> Date: Mon, 9 Jan 2006 08:19:50 +1300 From: Martin Langhoff To: "Brown, Len" Subject: Re: git pull on Linux/ACPI release tree Cc: "David S. Miller" , torvalds@osdl.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@osdl.org, git@vger.kernel.org In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Content-Disposition: inline References: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1248 Lines: 34 On 1/9/06, Brown, Len wrote: > Perhaps the tools should try to support what "a lot of people" > expect, rather than making "a lot of people" do extra work > because of the tools? I think it does. All the tricky stuff that David and Junio have been discussing is actually done very transparently by git-rebase Now, git-rebase uses git-format-patch | git-am so it sometimes has problems merging. In that case, you can choose to either resolve the problem (see the doco for how to signal to git-am that you've resolved a conflict) or to cancel the rebase. If you choose to cancel the rebase, do cp .git/refs/heads/{,} cat .git/HEAD_ORIG > .git/refs/heads/ git-reset --hard rm -fr .dotest and you'll be back to where you started. Perhaps this could be rolled into something like git-rebase --cancel to make it easier, but that's about it. The toolchain definitely supports it. cheers, martin - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/