Re: [PATCH v3 6/7] git-rebase.txt: address confusion between --no-ff vs --force-rebase

From: Elijah Newren <newren@gmail.com>
Date: Jun 21, 2018, 21:22 UTC
Message-ID: <CABPp-BH0c-wgjjj7Rzy-KRzKDMc8PLK5GqrGrnCUjzpux4VGLg@mail.gmail.com>
In-Reply-To: <xmqqbmc3swaa.fsf@gitster-ct.c.googlers.com>

On Thu, Jun 21, 2018 at 1:46 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 21 quoted lines

> Elijah Newren <newren@gmail.com> writes:
>
>> rebase was taught the --force-rebase option in commit b2f82e05de ("Teach
>> rebase to rebase even if upstream is up to date", 2009-02-13).  This flag
>> worked for the am and merge backends, but wasn't a valid option for the
>> interactive backend.
>> ...
>>  INCOMPATIBLE OPTIONS
>>  --------------------
>>
>> @@ -559,11 +549,6 @@ Other incompatible flag pairs:
>>  BEHAVIORAL INCONSISTENCIES
>>  --------------------------
>>
>> -  * --no-ff vs. --force-rebase
>> -
>> -    These options are actually identical, though their description
>> -    leads people to believe they might not be.
>
> Ah, I should have held off my review of 5/7 before reading this one.
> Perhaps we want to do this before the step 5/7 to reduce the churn?

Sure, I can switch the order around.