From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: "Kerry, Richard" <richard.kerry@atos.net>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Ort-merge: What does "ort" mean?
Date: Wed, 24 Feb 2021 10:42:01 +0000 [thread overview]
Message-ID: <YDYteUnxQZuPIAML@camp.crustytoothpaste.net> (raw)
In-Reply-To: <AM0PR02MB4081D3C17C53DB5CD9021C5E9C9F9@AM0PR02MB4081.eurprd02.prod.outlook.com>
[-- Attachment #1: Type: text/plain, Size: 727 bytes --]
On 2021-02-24 at 10:05:12, Kerry, Richard wrote:
>
> It's now been quite a few weeks, probably months, since the
> "ort-merge" work has been going one. However, I don't think I've ever
> seen an explanation of what "ort" means. I know it means "place" in
> German, but that seems an unlikely usage because git project generally
> works in English. I don't know of it as a word in English. So maybe
> it's an acronym - ORT. But what does that mean?
>
> So, can someone please say what "ort" means?
I believe it's a joke. One can use the -s option to control the
strategy, so you could write "git merge -sort" to use the new
implementation.
--
brian m. carlson (he/him or they/them)
Houston, Texas, US
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
next prev parent reply other threads:[~2021-02-24 10:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 10:05 Ort-merge: What does "ort" mean? Kerry, Richard
2021-02-24 10:39 ` Ævar Arnfjörð Bjarmason
2021-02-24 10:42 ` brian m. carlson [this message]
2021-02-24 19:21 ` Elijah Newren
2021-02-24 23:22 ` Eric Sunshine
2021-02-24 19:27 ` Elijah Newren
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=YDYteUnxQZuPIAML@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=richard.kerry@atos.net \
/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.