From: Tom Clarke <tom@u2i.com>
Date: Tue, 02 Oct 2007 10:29:42 GMT
Subject: Re: [PATCH] Adding rebase merge strategy
Message-ID: <550f9510710020329m7917dc9m2bb6cfc4055fea84@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0710021056280.28395@racer.site>

On 10/2/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 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'.

That's a good point, in addition to being able to do a git pull that
uses rebase, it would be useful make this configurable so you can
always safely do 'git pull'.

So it's perhaps the question is whether rebasing should be treated as
a kind of merging, or as an alternative to merging when pulling.
Incidentally, are there any other cases other than pulling where using
rebase as an alternative merge strategy is useful?

-Tom