Re: [PATCH 3/3] t/t4013: add test for --diff-merges=off

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 17, 2020, 17:17 UTC
Message-ID: <xmqqr1s52nv5.fsf@gitster.c.googlers.com>
In-Reply-To: <874kp4uoic.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

Show 5 quoted lines

> So, do these both effectively resolve to:
>
>       git log -m --no-diff-merges --first-parent --patch 
>
> where first -m is the one implied by --first-parent, ...

Eh, why does --first-parent even affect the choice of -m/no-m when --no-diff-merges is explicitly given?

> This is too complicated for my taste.

No one is forcing you to rely on the implication by --first-parent. You can always give an explicit --[no-]diff-merges when you use the "--first-parent" option.

Thanks.