From: Rustom Mody <rustompmody@gmail.com>
Date: Mon, 20 Jul 2009 16:01:34 GMT
Subject: Re: how to reorder commits
Message-ID: <f46c52560907200901w67edbbdcpe405f28d98953354@mail.gmail.com>
In-Reply-To: <adf1fd3d0907200837k63f21504v3d660f9503962fcf@mail.gmail.com>

On Mon, Jul 20, 2009 at 9:07 PM, Santi Béjar<santi@agolina.net> wrote:
> 2009/7/20 Rustom Mody <rustompmody@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.
>
> "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^

Beautiful -- plumbing is nifty!

>
> But normally you reorder "changes", not trees.

Which may not always be conflict-free?