From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 03 Feb 2009 11:47:17 GMT
Subject: Re: Heads up: major rebase -i -p rework coming up
Message-ID: <alpine.DEB.1.00.0902031247070.6573@intel-tinevez-2-302>
In-Reply-To: <20090203190517.6117@nanako3.lavabit.com>

Hi,

On Tue, 3 Feb 2009, Nanako Shiraishi wrote:

> Quoting Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> 
> > Nanako had a script at some stage; I would prefer an subcommand to 
> > "git rerere" which reconstructs the whole merge in-memory, and then 
> > records the conflict's resolution.
> 
> I'm sorry but I'm not sure what script of mine you are referring to.

http://article.gmane.org/gmane.comp.version-control.git/96911

Ciao,
Dscho