From: Eric Raible Date: Thu, 28 Oct 2010 06:39:34 GMT Subject: Re: Why the default action for pull is merge, but not rebase? Message-ID: <4CC91AA6.2000301@nextest.com> In-Reply-To: <78EBA946-B3BA-458B-9528-C5F80872B3E0@sb.org> On 10/27/2010 8:27 PM, Kevin Ballard wrote: > On Oct 27, 2010, at 7:53 PM, Joshua Jensen wrote: > >> ----- Original Message ----- >> From: Eric Raible >> Date: 10/27/2010 1:30 PM >>> >>> I would much prefer if branch..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. But it's not backwards incompatible: only true/false are now allowed so an arbitrary string would not currently be used. In my proposal a string would imply true, and would mean "append the specified value when running rebase".