From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 02 Oct 2007 10:00:40 GMT
Subject: Re: [PATCH] Adding rebase merge strategy
Message-ID: <Pine.LNX.4.64.0710021056280.28395@racer.site>
In-Reply-To: <20071001223050.GE2137@spearce.org>

Hi,

On Mon, 1 Oct 2007, Shawn O. Pearce wrote:

> But I have to agree with (was it Junio who said this?) doing a rebase
> in a merge strategy doesn't make sense when conflicts come into play.

In contrast, I think that it makes sense, absolutely.  If you asked for 
"rebase", you _have_ to know what is coming.

It's all about convenience: in many repos, I just to "git pull", because 
there is really only one upstream.

But in one repo, the upstream is svn, and I mistakenly checked in a merge.  
Not wanting to know svn deeply, I have no nice way (as I would have with 
git) to cover up my mistake.  So in this repo, I would have liked to set 
branch.master.mergeOptions to '-s rebase'.

Ciao,
Dscho