Re: git pull on Linux/ACPI release tree
flat view
From: Linus Torvalds <torvalds@osdl.org>
Date: 2006-01-09 06:13:57
Also in:
linux-acpi, lkml
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