git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Derrick Stolee <stolee@gmail.com>,
	Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org, me@ttaylorr.com,
	Derrick Stolee <dstolee@microsoft.com>,
	"brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH] revision: --include-diversions adds helpful merges
Date: Wed, 8 Apr 2020 16:05:26 -0400	[thread overview]
Message-ID: <20200408200526.GA2270445@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqzhbloj4u.fsf@gitster.c.googlers.com>

On Wed, Apr 08, 2020 at 12:46:41PM -0700, Junio C Hamano wrote:

> Our features written with the intent to be useful for one purpose
> often end up being used for purposes other than what the feature was
> originally written for (the "--pickaxe" has always been a bitter
> example of this for me).
> 
> For that reason, I am a bit hesitant to endorse "audit" exactly
> because of the implication of "intent".

Yeah, I agree with this.

> I wonder if there is a simple-enough phrase to convey what the
> latter half of above sentence says.  "include" and "keep" are both
> good verbs---normally we discard these merges, because they do not
> contribute at the level of individual changes, but with the option,
> we "include" or "keep" these merges in the output.  It's not like
> we keep _all_ the merges, but selected merges only.  How do we
> decide which merges to keep?
> 
> I guess your "--first-merges" came from such a line of thought, and
> is the closest among the five to what I have in mind, but it drops
> too many words and loses too much meaning.  
> 
> "--keep-first-parent-merges", perhaps?

FWIW, this name left me more confused, because "first-parent merges"
isn't an already-defined term I knew. And it seems like all merges have
a first parent. Having read the patch description, I guess it's "a merge
which isn't TREESAME to its first-parent".

I can't think of a more succinct way to name that, though. And possibly
if we gave that definition in the documentation, that would be enough.
The name doesn't have to be a complete description; it only has to make
sense once you know what you're trying to do (and be memorable enough).

-Peff

  reply	other threads:[~2020-04-08 20:05 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-08  1:22 Derrick Stolee via GitGitGadget
2020-04-08  1:30 ` Junio C Hamano
2020-04-08  1:39   ` Derrick Stolee
2020-04-08 15:28     ` Derrick Stolee
2020-04-08 19:46       ` Junio C Hamano
2020-04-08 20:05         ` Jeff King [this message]
2020-04-08 20:22           ` Derrick Stolee
2020-04-08 21:35             ` Junio C Hamano
2020-04-08 23:59               ` Derrick Stolee
2020-04-09  0:08                 ` Junio C Hamano
2020-04-09 11:52                   ` Derrick Stolee
2020-04-09 14:28                   ` Philip Oakley
2020-04-09 15:56                     ` Junio C Hamano
2020-04-09 17:20                       ` Derrick Stolee
2020-04-09 18:24                         ` Jeff King
2020-04-09 18:55                           ` Junio C Hamano
2020-04-09 19:21                             ` Jeff King
2020-04-08  2:13 ` brian m. carlson
2020-04-08 18:48 ` Jeff King
2020-04-09  0:01 ` [PATCH v2] " Derrick Stolee via GitGitGadget
2020-04-10 12:19   ` [PATCH v3] revision: --show-pulls " Derrick Stolee via GitGitGadget
2020-04-10 20:06     ` Junio C Hamano
2020-04-10 21:43       ` Derrick Stolee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200408200526.GA2270445@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=dstolee@microsoft.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=me@ttaylorr.com \
    --cc=sandals@crustytoothpaste.net \
    --cc=stolee@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).