From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 08 Nov 2008 15:08:41 GMT
Subject: Re: pull --preserve-merges
Message-ID: <alpine.DEB.1.00.0811081607300.30769@pacific.mpi-cbg.de>
In-Reply-To: <20081107160138.aa96405c.stephen@exigencecorp.com>

Hi,

On Fri, 7 Nov 2008, Stephen Haberman wrote:

> Awhile ago I brought up wanting to have a "rebase with preserve merges"
> option for `git pull`

That might be something you want, but you cannot call it

	git pull --preserve-merges

since everybody used to "pull = fetch && merge" would go "Huh? A merge 
_does_ preserve merges".

If at all, you could call it "--rebase=preserve-merges".

Ciao,
Dscho