From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: git pull on Linux/ACPI release tree Date: Sun, 08 Jan 2006 11:33:49 -0800 Message-ID: <7vace61plu.fsf@assigned-by-dhcp.cox.net> References: <46a038f90601081119r39014fbi995cc8b6e95774da@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: In-Reply-To: <46a038f90601081119r39014fbi995cc8b6e95774da-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> (Martin Langhoff's message of "Mon, 9 Jan 2006 08:19:50 +1300") Sender: linux-acpi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Martin Langhoff Cc: "Brown, Len" , "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 List-Id: linux-acpi@vger.kernel.org Martin Langhoff writes: > 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. Careful. I do not think rebase works across merges at all. - 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