* Ort-merge: What does "ort" mean? @ 2021-02-24 10:05 Kerry, Richard 2021-02-24 10:39 ` Ævar Arnfjörð Bjarmason ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Kerry, Richard @ 2021-02-24 10:05 UTC (permalink / raw) To: git@vger.kernel.org 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? Regards, Richard. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Ort-merge: What does "ort" mean? 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:27 ` Elijah Newren 2 siblings, 0 replies; 6+ messages in thread From: Ævar Arnfjörð Bjarmason @ 2021-02-24 10:39 UTC (permalink / raw) To: Kerry, Richard; +Cc: git@vger.kernel.org On Wed, Feb 24 2021, 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? $ head -n 3 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Ort-merge: What does "ort" mean? 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 2021-02-24 19:27 ` Elijah Newren 2 siblings, 1 reply; 6+ messages in thread From: brian m. carlson @ 2021-02-24 10:42 UTC (permalink / raw) To: Kerry, Richard; +Cc: git@vger.kernel.org [-- 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 --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Ort-merge: What does "ort" mean? 2021-02-24 10:42 ` brian m. carlson @ 2021-02-24 19:21 ` Elijah Newren 2021-02-24 23:22 ` Eric Sunshine 0 siblings, 1 reply; 6+ messages in thread From: Elijah Newren @ 2021-02-24 19:21 UTC (permalink / raw) To: brian m. carlson, Kerry, Richard, git@vger.kernel.org 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/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Ort-merge: What does "ort" mean? 2021-02-24 19:21 ` Elijah Newren @ 2021-02-24 23:22 ` Eric Sunshine 0 siblings, 0 replies; 6+ messages in thread From: Eric Sunshine @ 2021-02-24 23:22 UTC (permalink / raw) To: Elijah Newren; +Cc: brian m. carlson, Kerry, Richard, git@vger.kernel.org On Wed, Feb 24, 2021 at 2:23 PM Elijah Newren <newren@gmail.com> wrote: > It actually has meaning beyond being a joke, though: > > * 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. > :-) "Extended LInear Jump AHead" is still my favorite because it sounds cool. However, I wouldn't sneeze at "UNiversally Systematic Heuristic Iterative Newtonian Elliptic", which is probably a more apt description of what you implemented, but I digress. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Ort-merge: What does "ort" mean? 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:27 ` Elijah Newren 2 siblings, 0 replies; 6+ messages in thread From: Elijah Newren @ 2021-02-24 19:27 UTC (permalink / raw) To: Kerry, Richard; +Cc: git@vger.kernel.org On Wed, Feb 24, 2021 at 2:17 AM Kerry, Richard <richard.kerry@atos.net> wrote: > > > It's now been quite a few weeks, probably months, since the "ort-merge" work has been going one. Years, actually. See https://lore.kernel.org/git/xmqqk1ydkbx0.fsf@gitster.mtv.corp.google.com/; you could argue the work started before that or after that point, but it gives a rough estimate of how long work has been ongoing (with several stops and starts along the way). > 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? Already responded down-thread so I won't repeat here. :-) ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-24 23:26 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 2021-02-24 23:22 ` Eric Sunshine 2021-02-24 19:27 ` Elijah Newren
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).