RT @clementd: Merge commits are a good thing. Don't mess with history just to have a linear commit tree. Or go back to SVN.