Guillaume Lelarge wrote:
> Le mardi 24 novembre 2009 à 09:50:17, Dave Page a écrit :
>> On Mon, Nov 23, 2009 at 8:00 PM, Guillaume Lelarge
>>
>> <guillaume@lelarge.info> wrote:
>>> I finally found local branches. They are quite useful :) So I think I'll
>>> try to learn more about git.
>> Ahh - there we go. Another convert :-).
>>
>
> Yes. I was quite impressed so far.
>
> Unfortunately, yesterday evening, I had a big fight with it. I tried the "git
> rebase git-svn --interactive", and I did a big mistake (IIRC, I tried to
> squash the first commit, which it didn't like at all). I didn't find a way to
> fix my mistake, so I had to "git svn clone" once again (which, BTW, is a
> really long, long operation).
If you were still in rebase mode, "git rebase --abort" might've saved
you. Interactive rebase is very powerful. I use it every now and then
but you need to be a bit careful. And abort if it goes wrong.
--
Heikki Linnakangas
EnterpriseDB http://www.enterprisedb.com