From: Kevin Ballard <kevin@sb.org>
Date: Thu, 28 Oct 2010 03:27:12 GMT
Subject: Re: Why the default action for pull is merge, but not rebase?
Message-ID: <78EBA946-B3BA-458B-9528-C5F80872B3E0@sb.org>
In-Reply-To: <4CC8E5B5.7050404@workspacewhiz.com>

On Oct 27, 2010, at 7:53 PM, Joshua Jensen wrote:

> ----- 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.

Sure would be nice, but that sort of backwards-incompatible change would likely break a lot of people who rely on the current flattening behavior.

-Kevin Ballard