Re: Why the default action for pull is merge, but not rebase?
On Oct 27, 2010, at 7:53 PM, Joshua Jensen wrote:
Show 13 quoted lines
> ----- 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
Kevin Ballard <kevin@sb.org>