From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 11 Apr 2011 15:03:07 GMT
Subject: Re: Converting merge to rebase in the presence of conflicts
Message-ID: <4DA3182B.2030305@viscovery.net>
In-Reply-To: <BANLkTi=krC6JMEWj=a5CY1vRCcmh9b+BaQ@mail.gmail.com>

Am 4/11/2011 16:13, schrieb Hrvoje Nikšić:
> Is there a way to rebase the branch without redoing conflict
> resolution?

git config --global rerere.enabled true

-- Hannes