Martin Langhoff <[EMAIL PROTECTED]> writes: > On 1/9/06, Brown, Len <[EMAIL PROTECTED]> 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 <upstream> > > Now, git-rebase uses git-format-patch <options> | git-am <options> 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 [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
