Re: git pull on Linux/ACPI release tree

From: Linus Torvalds <>
Date: 2006-01-09 17:13:49
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.

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at
Received on Mon Jan 09 17:14:30 2006

This archive was generated by hypermail 2.1.8 : 2006-01-09 17:14:38 EST