On Mon, 9 Jan 2006, Martin Langhoff wrote: > > and if it does anything but a very trivial merge, backtrack and do a merge.
To be fair, backtracking a "git-rebase" isn't obvious. One of the
downsides of rebasing.
Linus
-
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
