From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Langhoff Subject: Re: git pull on Linux/ACPI release tree Date: Mon, 9 Jan 2006 08:19:50 +1300 Message-ID: <46a038f90601081119r39014fbi995cc8b6e95774da@mail.gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: "David S. Miller" , torvalds-3NddpPZAyC0@public.gmane.org, linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, akpm-3NddpPZAyC0@public.gmane.org, git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org X-From: linux-acpi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Sun Jan 08 20:19:57 2006 Return-path: Envelope-to: glad-acpi-devel-Uylq5CNFT+jYtjvyW6yDsg@public.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Evg53-0004X1-Uh for glad-acpi-devel-Uylq5CNFT+jYtjvyW6yDsg@public.gmane.org; Sun, 08 Jan 2006 20:19:55 +0100 Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand id S1161086AbWAHTTw (ORCPT ); Sun, 8 Jan 2006 14:19:52 -0500 Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org id S1161103AbWAHTTw (ORCPT ); Sun, 8 Jan 2006 14:19:52 -0500 Received: from wproxy.gmail.com ([64.233.184.205]:35423 "EHLO wproxy.gmail.com") by vger.kernel.org with ESMTP id S1161089AbWAHTTv convert rfc822-to-8bit (ORCPT ); Sun, 8 Jan 2006 14:19:51 -0500 Received: by wproxy.gmail.com with SMTP id 57so3165377wri for ; Sun, 08 Jan 2006 11:19:50 -0800 (PST) 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= Received: by 10.54.114.4 with SMTP id m4mr7441229wrc; Sun, 08 Jan 2006 11:19:50 -0800 (PST) Received: by 10.54.71.5 with HTTP; Sun, 8 Jan 2006 11:19:50 -0800 (PST) To: "Brown, Len" In-Reply-To: Content-Disposition: inline Sender: linux-acpi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Precedence: bulk X-Mailing-List: linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org 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-acpi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html