Re: [PATCH v2 0/7] making log --first-parent imply -m

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 7, 2020, 21:54 UTC
Message-ID: <xmqqft8yf7gj.fsf@gitster.c.googlers.com>
In-Reply-To: <87y2mqjh9f.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

Show 9 quoted lines

> The only question regarding it I then have for now is what are
> preferences for names selection inside single option? Abbreviated yet
> somewhat sensible, or verbose? I mean:
>
> --diff-merges=first vs --diff-merges=first-parent
>
> --diff-merges=comb vs --diff-merges=combined
>
> etc. What's better?

If we were to shoot for easy-to-type, we could go for ultra-short abbreviations like 'no', 'c', 'cc', 'each' (the last one is the traditional "-m" when used without "--first-parent"; diff with each parent) and later add 'fp', but in a sense we are already lost the easy-to-type goal by "--diff-merges" being sufficiently long.

I personally wouldn't choose "first" or "first-parent", but just use "1", so that we could support "2" when viewing a merge that was done in the wrong direction with "git show", though. IOW, even though I said that "use these parents but not those" (i.e. set of parents) smells overkill, at least to me, I think specifying a single parent that is not necessarily the first one would be a reasonable thing to do.

So, if I were to vote, it would be

    "--diff-merges=" ( first-parent        | 1 |
		       combined            | c |
                       dense-combined      | cc |
                       each-parent         | m )
    "--no-diff-merges"

leaving some room to add '2' and  <any posInt> later.