# Ort-merge: What does "ort" mean? 6 messages from 2021-02-24 to 2021-02-24. Participants: Kerry, Richard, Ævar Arnfjörð Bjarmason, brian m. carlson, Elijah Newren, Eric Sunshine. Thread: https://gitlist.dev/t/55203 ## Kerry, Richard, 2021-02-24 10:05 Subject: Ort-merge: What does "ort" mean? Message-ID: URL: https://gitlist.dev/e/AM0PR02MB4081D3C17C53DB5CD9021C5E9C9F9%40AM0PR02MB4081.eurprd02.prod.outlook.com ``` 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. ``` ## Ævar Arnfjörð Bjarmason, 2021-02-24 10:39 Subject: Re: Ort-merge: What does "ort" mean? Message-ID: <871rd592bo.fsf@evledraar.gmail.com> URL: https://gitlist.dev/e/871rd592bo.fsf%40evledraar.gmail.com In-Reply-To: ``` 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 ``` ## brian m. carlson, 2021-02-24 10:42 Subject: Re: Ort-merge: What does "ort" mean? Message-ID: URL: https://gitlist.dev/e/YDYteUnxQZuPIAML%40camp.crustytoothpaste.net In-Reply-To: ``` 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 ``` ## Elijah Newren, 2021-02-24 19:21 Subject: Re: Ort-merge: What does "ort" mean? Message-ID: URL: https://gitlist.dev/e/CABPp-BEKJrRkhb2W0SWpjCawG4ZVs8oVuhQ5SJ%2B7zT331ybhSA%40mail.gmail.com In-Reply-To: ``` On Wed, Feb 24, 2021 at 5:13 AM brian m. carlson 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/ ``` ## Elijah Newren, 2021-02-24 19:27 Subject: Re: Ort-merge: What does "ort" mean? Message-ID: URL: https://gitlist.dev/e/CABPp-BEKDOSac29vix0xsemYdBDL6h47TwFd%2BQ%3DsdD8_HDYLJA%40mail.gmail.com In-Reply-To: ``` On Wed, Feb 24, 2021 at 2:17 AM Kerry, Richard 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. :-) ``` ## Eric Sunshine, 2021-02-24 23:22 Subject: Re: Ort-merge: What does "ort" mean? Message-ID: URL: https://gitlist.dev/e/CAPig%2BcQO6q_caD_KGc4ahSRKDBst%2BY30haTbReK3GSwsUfMt6A%40mail.gmail.com In-Reply-To: ``` On Wed, Feb 24, 2021 at 2:23 PM Elijah Newren 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. ```