Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.

From

Junio C Hamano <gitster@pobox.com>

Date

Oct 7, 2014, 20:27 UTC

Message-ID

<xmqqegujeibx.fsf@gitster.dls.corp.google.com>

In-Reply-To

<87fvezsk5k.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

>> Why would it be useful to limit the history to a shape where all
>> merges are the ones that could have been fast-forwarded?
>
> Except by true merge, how else can I express with git that 'n'
> consequitive commits constitute single logical change (being originally
> some topic branch)?

You are justifying --no-ff, aren't you?

> Moreover, as topic branches are usually rebased before merge anyway,
> why shouldn't I have simple capability to enforce it?