> Remember, a branch in git is very cheap, and is a powerful way > to keep track of things while you decide which alternate > universe to take. And even after you decide, you could always > look at and even build on the other universe. I feel embarrassed to say this but in my branch there are commits to the driver and other commits for the board so it looks more like ---0---D1---B1---B2---D2---B3---B4--- D* - driver changes B* - board changes So to go back to the 0 state I lose my board changes. But I hope what I did (in my reply to Linus) is very close to your idea of having separate branches. David - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html