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

From: Stephen Haberman <[email-masked]>
Date: Fri, 9 Aug 2013 10:28:27 -0500

> We have a patch in Git for Windows allowing rebase = interactive
> which I did not have time to send upstream.

Cool, so, would rebase=preserve and rebase=interactive be completely
orthogonal?

E.g. do we have to worry about the user wanting to do both, like with
something ugly like rebase=preserve-interactive?

Assuming not, rebase=preserve sounds good to me. I have a patch
that does that about ready to submit.

- Stephen