Re: [PATCH] pull: Allow pull to preserve merges when rebasing.

On Sun, Aug 11, 2013 at 2:16 AM, Eric Sunshine [off-list ref] wrote:

Also, it's not clear from the documentation how one would override
pull.rebase=preserve in order to do a normal non-preserving rebase.
From reading the code, one can see that --preserve=true (or

s/--preserve=true/--rebase=true/

--no-rebase followed by --rebase) will override pull.rebase=preserve,
but it would be hard for someone to guess this. One could imagine
people thinking that --rebase alone would intuitively override
pull.rebase=preserve, or that --preserve=no-preserve would do so, but
that's getting ugly.