From: Stephen Haberman <stephen@exigencecorp.com>
Date: Fri, 09 Aug 2013 15:28:27 GMT
Subject: Re: [PATCH] pull: Allow pull to preserve merges when rebasing.
Message-ID: <20130809102827.3c5d09fa@sh9>
In-Reply-To: <alpine.DEB.1.00.1308091618530.24252@s15462909.onlinehome-server.info>


> 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