From: Joshua Jensen <jjensen@workspacewhiz.com>
Date: Thu, 28 Oct 2010 02:53:41 GMT
Subject: Re: Why the default action for pull is merge, but not rebase?
Message-ID: <4CC8E5B5.7050404@workspacewhiz.com>
In-Reply-To: <4CC87DE6.9090604@nextest.com>

----- Original Message -----
From: Eric Raible
Date: 10/27/2010 1:30 PM
> One frustrating aspect of branch.<name>.rebase is that AFAIK
> there's no way for it to preserve merges.
>
> I would much prefer if branch.<name>.rebase was allowed to
> specify the arguments to be passed to rebase:
>
> 	git config branch.mybranch.rebase "-i --preserve-merges"
>
> Anyone else see the value of something like this?
When --preserve-merges actually preserves the merges (perhaps the 
rebase-i-p branch is on the way to finishing this feature??  I couldn't 
get it to apply...), I would like this facility very much.  By default, 
I think rebase *should* preserve merges, and the current flattening it 
does now should be an option.

Josh