From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Jeff King <peff@peff.net>,
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, 08 Apr 2020 17:08:42 -0700 [thread overview]
Message-ID: <xmqqimi9o705.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <91fafa17-c58f-dcd0-320d-48c4512561f6@gmail.com> (Derrick Stolee's message of "Wed, 8 Apr 2020 19:59:16 -0400")
Derrick Stolee <stolee@gmail.com> writes:
>>> In my latest attempt at documentation, I called these merges "diverters"
>>> yet still used "--include-diversions". Here are a few other words that we
>>> could use:
>>>
>>> * diverters or diversions
>>> * redirects
>>> * switches (think railroad switch). Synonym: exchange
>>> * detours
>>
>> ...none of the above tells me that they are not no-op (in other
>> words, they do something meaningful), so I must be coming from
>> a direction different from you are. What redirects from what other
>> thing, for example?
>
> The merges do something meaningful: they "merge in" a "real" change.
Yes, but "redirect", "switch", "detour", or "divert" do not quite
mean "merging in a real change", at least to me.
> I'll just submit my v2 as-is, which includes a significant change to
> the documentation that should make things more clear.
Thanks.
next prev parent reply other threads:[~2020-04-09 0:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 1:22 [PATCH] revision: --include-diversions adds helpful merges 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqimi9o705.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.