From: Jeff King <peff@peff.net>
Date: Wed, 20 Mar 2019 05:09:44 GMT
Subject: Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified
Message-ID: <20190320050944.GB6401@sigill.intra.peff.net>
In-Reply-To: <xmqqbm26xtum.fsf@gitster-ct.c.googlers.com>

On Wed, Mar 20, 2019 at 09:38:57AM +0900, Junio C Hamano wrote:

> "git log -p --first-parent" that requires "-m" to show the single
> ball of wax diff for a merge is a separate matter.  When the user
> explicitly says "log --first-parent", it is a clear indication that
> the user does not want to see individual steps of how side branches
> built what each merge brings into the mainline.  From that point of
> view, ever sice I introduced "--first-parent" traversal, I've been
> wondering what the true downside would be if we turned "-m" on
> automatically when these two options are used without "-m".

Sort of a drive-by two cents, but I have often wondered the same thing.
I cannot think of a time when I wanted "--first-parent" without "-m"
(unless I was not viewing diffs at all).

(And I agree with everything else you said :) ).

-Peff