2009/7/20 Rustom Mody <rustompmody@xxxxxxxxx>: > I have a sequence of commits. I tried to reorder the top two in this way. > $ git rebase -i HEAD^^ > > flip the two pick lines and exit vi > > I find my file full of conflict markers. "git rebase" applies the changes between the commit and the parent, and if the changes have conflicts this is what you get. > So what is the way of doing: > HEAD becomes current HEAD^ > HEAD^ becomes current HEAD $ git branch old $ git reset --hard HEAD~2 $ git read-tree old $ git commit -C old $ git read-tree old^ $ git commit -C old^ But normally you reorder "changes", not trees. HTH, Santi -- To unsubscribe from this list: 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