From: Stephen Haberman <stephen@exigencecorp.com>
Date: Mon, 12 Aug 2013 16:28:01 GMT
Subject: Re: [PATCH] pull: Allow pull to preserve merges when rebasing.
Message-ID: <20130812112801.0aae67a2@sh9>
In-Reply-To: <7vpptjz9r1.fsf@alter.siamese.dyndns.org>

Hi Junio,

> "-r", even though it happens to be accepted, is not a good idea
> here, as there are other --r* commands that are not --rebase.
> 
> 	[--[no-]rebase|--rebase=preserve]

Cool, I will change that.

> You would want "bool or string" helper function to parse it
> correctly, something like:

Oh, interesting, I had not thought of that--thanks for that
git config --bool snippet, that's really helpful.

- Stephen