Re: [PATCHv4 0/2] Teach the --no-ff option to 'rebase -i'.

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 24, 2010, 17:13 UTC
Message-ID: <7vaatxskwc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1269445261-2941-1-git-send-email-marcnarc@xiplink.com>

Marc Branchaud <marcnarc@xiplink.com> writes:

Show 10 quoted lines

> Thanks to both Junio and Jonathan for your patience in working through this.
>
> Junio, I think I see what you mean.  I like teaching --no-ff to 'rebase -i'
> because it allows me to combine two commands into one for this situation.
>
> I've split this work into two patches:
>
> The first one simply teaches "rebase -i" to accept and ignore -f.  I feel
> this is better than adding text to the man page explaining why interactive
> rebase has --no-ff but not -f, while non-interactive has the opposite.

I am mildly against that change; I cannot explain why "rebase -i" accepts and then ignores "-f" myself to the users. "Non interactive one knows -f but interactive doesn't" is not necessarily an inconsistency. "--force" is about forcing what would normally rejected, and if the latter doesn't have anything that normally rejects, it doesn't need to have a "--force".

On the other hand, I wouldn't mind at all if you were to add "--no-ff" to non-interactive rebase; that has a much easier and logical explanation.