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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 21, 2018, 20:46 UTC
Message-ID: <xmqqbmc3swaa.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180621150023.23533-7-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 16 quoted lines

> 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?