From: Elijah Newren <newren@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>,
"Kerry, Richard" <richard.kerry@atos.net>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Ort-merge: What does "ort" mean?
Date: Wed, 24 Feb 2021 11:21:15 -0800 [thread overview]
Message-ID: <CABPp-BEKJrRkhb2W0SWpjCawG4ZVs8oVuhQ5SJ+7zT331ybhSA@mail.gmail.com> (raw)
In-Reply-To: <YDYteUnxQZuPIAML@camp.crustytoothpaste.net>
On Wed, Feb 24, 2021 at 5:13 AM brian m. carlson
<sandals@crustytoothpaste.net> wrote:
>
> 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.
It actually has meaning beyond being a joke, though:
$ head -n 15 merge-ort.c
/*
* "Ostensibly Recursive's Twin" merge strategy, or "ort" for short. Meant
* as a drop-in replacement for the "recursive" merge strategy, allowing one
* to replace
*
* git merge [-s recursive]
*
* with
*
* git merge -s ort
*
* Note: git's parser allows the space between '-s' and its argument to be
* missing. (Should I have backronymed "ham", "alsa", "kip", "nap, "alvo",
* "cale", "peedy", or "ins" instead of "ort"?)
*/
However, I learned my lesson -- Eric is way better at coming up with
names than me[1] so if I need more names in the future, I'll ping him.
:-)
[1] https://lore.kernel.org/git/CAPig+cQ2e4NF6GhRvCTgt1KpPG5Lw_ybPM5FeWtmc69rxvXFuQ@mail.gmail.com/
next prev parent reply other threads:[~2021-02-24 19:25 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
2021-02-24 19:21 ` Elijah Newren [this message]
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
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=CABPp-BEKJrRkhb2W0SWpjCawG4ZVs8oVuhQ5SJ+7zT331ybhSA@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=richard.kerry@atos.net \
--cc=sandals@crustytoothpaste.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.
Code repositories for project(s) associated with this public 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).