What is the best way to rebase against linux-next

Tim Gardner tim.gardner at canonical.com
Wed Apr 29 15:31:44 UTC 2009


I've been experimenting with keeping ubuntu-next up to date with
linux-next, but I'm having some problems getting a clean rebase while
still preserving some local changes (such as the commit that adds the
debian directory).

This is what I'm doing:

git remote add next
git fetch next
git rebase next/master

The rebase conflicts frequently (as you might expect), so I just 'git
rebase --skip' thinking that this performs the upstream commit and drops
the local conflicting commit. At the end of the process I compared the 2
trees and found some differences that I did not expect. Any thoughts?

Tim Gardner tim.gardner at canonical.com

More information about the kernel-team mailing list