Re: Re: Re: Why the default action for pull is merge, but not rebase?

On 11:59 AM, Jonathan Nieder wrote:

Eugene Sajine wrote:

quoted

So, I just have to run git pull --rebase to get my scenario working, right?

Maybe the “[branch "<name>"] rebase” and “[branch] autosetuprebase”
configuration items could help.

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?