On Sun, Sep 07, 2008 at 11:51:26AM +0000, Joel Soete wrote: > Hello Kyle, > The history is non-linear, because I rebased it: git fetch origin; git reset --hard origin/master while on your master branch should resolve it. But be careful, it will remove any of your local changes. -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
