{"thread":{"id":"55203","subject":"Ort-merge: What does \"ort\" mean?","startedAt":"2021-02-24T10:12:59Z","lastAt":"2021-02-24T23:24:08Z","messageCount":6,"participants":["Kerry, Richard","Ævar Arnfjörð Bjarmason","brian m. carlson","Elijah Newren","Eric Sunshine"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"417671","messageId":"AM0PR02MB4081D3C17C53DB5CD9021C5E9C9F9@AM0PR02MB4081.eurprd02.prod.outlook.com","threadId":"55203","inReplyTo":null,"subject":"Ort-merge: What does \"ort\" mean?","fromName":"Kerry, Richard","fromEmail":"richard.kerry@atos.net","sentAt":"2021-02-24T10:05:12Z","receivedAt":"2021-02-24T10:12:59Z","isPatch":false,"sender":{"key":"richard.kerry@atos.net","avatar":null},"body":"\nIt'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?\n\nSo, can someone please say what \"ort\" means?\n\nRegards,\nRichard.\n\n"},{"id":"417672","messageId":"871rd592bo.fsf@evledraar.gmail.com","threadId":"55203","inReplyTo":"AM0PR02MB4081D3C17C53DB5CD9021C5E9C9F9@AM0PR02MB4081.eurprd02.prod.outlook.com","subject":"Re: Ort-merge: What does \"ort\" mean?","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-02-24T10:39:55Z","receivedAt":"2021-02-24T10:40:41Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Feb 24 2021, Kerry, Richard wrote:\n\n> 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?\n>\n> So, can someone please say what \"ort\" means?\n\n$ head -n 3 merge-ort.c\n/*\n * \"Ostensibly Recursive's Twin\" merge strategy, or \"ort\" for short. Meant\n * as a drop-in replacement for the \"recursive\" merge strategy, allowing one\n"},{"id":"417673","messageId":"YDYteUnxQZuPIAML@camp.crustytoothpaste.net","threadId":"55203","inReplyTo":"AM0PR02MB4081D3C17C53DB5CD9021C5E9C9F9@AM0PR02MB4081.eurprd02.prod.outlook.com","subject":"Re: Ort-merge: What does \"ort\" mean?","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2021-02-24T10:42:01Z","receivedAt":"2021-02-24T10:43:45Z","isPatch":false,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On 2021-02-24 at 10:05:12, Kerry, Richard wrote:\n> \n> It's now been quite a few weeks, probably months, since the\n> \"ort-merge\" work has been going one. However, I don't think I've ever\n> seen an explanation of what \"ort\" means. I know it means \"place\" in\n> German, but that seems an unlikely usage because git project generally\n> works in English. I don't know of it as a word in English. So maybe\n> it's an acronym - ORT. But what does that mean?\n> \n> So, can someone please say what \"ort\" means?\n\nI believe it's a joke. One can use the -s option to control the\nstrategy, so you could write \"git merge -sort\" to use the new\nimplementation.\n-- \nbrian m. carlson (he/him or they/them)\nHouston, Texas, US\n"},{"id":"417711","messageId":"CABPp-BEKJrRkhb2W0SWpjCawG4ZVs8oVuhQ5SJ+7zT331ybhSA@mail.gmail.com","threadId":"55203","inReplyTo":"YDYteUnxQZuPIAML@camp.crustytoothpaste.net","subject":"Re: Ort-merge: What does \"ort\" mean?","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2021-02-24T19:21:15Z","receivedAt":"2021-02-24T19:22:25Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Wed, Feb 24, 2021 at 5:13 AM brian m. carlson\n wrote:\n>\n> On 2021-02-24 at 10:05:12, Kerry, Richard wrote:\n> >\n> > It's now been quite a few weeks, probably months, since the\n> > \"ort-merge\" work has been going one. However, I don't think I've ever\n> > seen an explanation of what \"ort\" means. I know it means \"place\" in\n> > German, but that seems an unlikely usage because git project generally\n> > works in English. I don't know of it as a word in English. So maybe\n> > it's an acronym - ORT. But what does that mean?\n> >\n> > So, can someone please say what \"ort\" means?\n>\n> I believe it's a joke. One can use the -s option to control the\n> strategy, so you could write \"git merge -sort\" to use the new\n> implementation.\n\nIt actually has meaning beyond being a joke, though:\n\n$ head -n 15 merge-ort.c\n/*\n * \"Ostensibly Recursive's Twin\" merge strategy, or \"ort\" for short. Meant\n * as a drop-in replacement for the \"recursive\" merge strategy, allowing one\n * to replace\n *\n * git merge [-s recursive]\n *\n * with\n *\n * git merge -s ort\n *\n * Note: git's parser allows the space between '-s' and its argument to be\n * missing. (Should I have backronymed \"ham\", \"alsa\", \"kip\", \"nap, \"alvo\",\n * \"cale\", \"peedy\", or \"ins\" instead of \"ort\"?)\n */\n\nHowever, I learned my lesson -- Eric is way better at coming up with\nnames than me[1] so if I need more names in the future, I'll ping him.\n:-)\n\n[1] https://lore.kernel.org/git/CAPig+cQ2e4NF6GhRvCTgt1KpPG5Lw_ybPM5FeWtmc69rxvXFuQ@mail.gmail.com/\n"},{"id":"417712","messageId":"CABPp-BEKDOSac29vix0xsemYdBDL6h47TwFd+Q=sdD8_HDYLJA@mail.gmail.com","threadId":"55203","inReplyTo":"AM0PR02MB4081D3C17C53DB5CD9021C5E9C9F9@AM0PR02MB4081.eurprd02.prod.outlook.com","subject":"Re: Ort-merge: What does \"ort\" mean?","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2021-02-24T19:27:47Z","receivedAt":"2021-02-24T19:28:57Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Wed, Feb 24, 2021 at 2:17 AM Kerry, Richard wrote:\n>\n>\n> It's now been quite a few weeks, probably months, since the \"ort-merge\" work has been going one.\n\nYears, actually. See\nhttps://lore.kernel.org/git/xmqqk1ydkbx0.fsf@gitster.mtv.corp.google.com/;\nyou could argue the work started before that or after that point, but\nit gives a rough estimate of how long work has been ongoing (with\nseveral stops and starts along the way).\n\n> 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?\n>\n> So, can someone please say what \"ort\" means?\n\nAlready responded down-thread so I won't repeat here. :-)\n"},{"id":"417765","messageId":"CAPig+cQO6q_caD_KGc4ahSRKDBst+Y30haTbReK3GSwsUfMt6A@mail.gmail.com","threadId":"55203","inReplyTo":"CABPp-BEKJrRkhb2W0SWpjCawG4ZVs8oVuhQ5SJ+7zT331ybhSA@mail.gmail.com","subject":"Re: Ort-merge: What does \"ort\" mean?","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2021-02-24T23:22:56Z","receivedAt":"2021-02-24T23:24:08Z","isPatch":false,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, Feb 24, 2021 at 2:23 PM Elijah Newren wrote:\n> It actually has meaning beyond being a joke, though:\n>\n> * Note: git's parser allows the space between '-s' and its argument to be\n> * missing. (Should I have backronymed \"ham\", \"alsa\", \"kip\", \"nap, \"alvo\",\n> * \"cale\", \"peedy\", or \"ins\" instead of \"ort\"?)\n> */\n>\n> However, I learned my lesson -- Eric is way better at coming up with\n> names than me[1] so if I need more names in the future, I'll ping him.\n> :-)\n\n\"Extended LInear Jump AHead\" is still my favorite because it sounds\ncool. However, I wouldn't sneeze at \"UNiversally Systematic Heuristic\nIterative Newtonian Elliptic\", which is probably a more apt\ndescription of what you implemented, but I digress.\n"}]}