From: Rustom Mody <rustompmody@gmail.com>
Date: Mon, 20 Jul 2009 15:07:50 GMT
Subject: how to reorder commits
Message-ID: <f46c52560907200807heed4bbfkde15cccd2ae8151d@mail.gmail.com>

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.
So what is the way of doing:
HEAD becomes current HEAD^
HEAD^ becomes current HEAD
without having to handle conflicts ??