From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 16 Jan 2007 22:51:36 GMT
Subject: Re: [RFC] Replace rebase with filtering
Message-ID: <Pine.LNX.4.63.0701162350150.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <2696299C-A54D-4A7E-BA3B-029C8E4B278D@silverinsanity.com>

Hi,

On Tue, 16 Jan 2007, Brian Gernhardt wrote:

> I'd put a simple patch to add the reset to git-merge.sh, but I'm not sure I
> understand what --skip is doing in there with a 30 second peek.

Better put "git reset --hard" into git-rebase.sh... Just search for 
"--skip" and you will find where it has to go.

> Maybe if I get more tuits, I'll do it, but someone more familiar with it 
> can probably do it much faster (and be more certain it's the right thing 
> to do).

But if _you_ do it, you gain knowledge about git!

Ciao,
Dscho