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

From: Stephen Haberman <stephen@exigencecorp.com>
Date: Aug 11, 2013, 23:09 UTC
Message-ID: <20130811180915.390d660a@sh9>
In-Reply-To: <CAPrKj1b=QTdqVH+JtukJrfEc=EqxWOEYE4YG7oSY7413uqdKfg@mail.gmail.com>

> 1. i'm not sure why you are testing $3 == preserve. it looks like a
> typo

Yes, good catch. I've added a test that fails, and will fix that.

> 2. clearer than a string of yoda conditions:
> 
> case $2 in
> true|false|preserve)

Makes sense, will change.

> 1. in the error message you say that rebase should be a trystate of
> true, false, or preserve. why then do you allow $rebase == '' ?

Because it may be unset, like if the user ran "git pull . copy" and the pull.rebase setting was not set.

> 2. clearer than a string of yoda conditions:

Will change again.

I'll wait to see if I get any more feedback and then will send out another version.

Thanks!

- Stephen