From: Peter Krefting <peter@softwolves.pp.se>
Date: Fri, 18 Jun 2010 09:10:58 GMT
Subject: Re: rebasing a merge
Message-ID: <alpine.DEB.2.00.1006181010220.12445@ds9.cixit.se>
In-Reply-To: <AANLkTilY_9j2sXlplhYB4FPAIAzuPBg2UyUTEk4DaaYF@mail.gmail.com>

Jay Soffian:

> Here's how I've been doing it, but I'll bet there's a less convoluted way:

Do you have git-rerere enabled? I have found that to be a major timesaver 
for cases like these.

-- 
\\// Peter - http://www.softwolves.pp.se/