git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: suggestion for git glossary: "ort"

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 16, 2022, 22:42 UTC
Message-ID
<xmqq5yn84pm2.fsf@gitster.g>
In-Reply-To
<2022Apr16.1107.scs.0007@quinine2.home>
scs@eskimo.com (Steve Summit) writes:
> I kept seeing references to "ort" in the git source code, and I
> had no idea what it meant.  Grepping around in the Documentation
> tree eventually revealed: it's a new merge strategy!  Suggested
> glossary patch attached; feel free to improve.

If the aim is to unconfuse those who are new to the codebase, read builtin/merge.c and merge-ort-*.[ch], and wonder what "ort" refers to, I doubt it would help all that much to add a new entry to the glossary, especially if they do not think of first taking a look at "git merge --help", which has its own large section on "ort".

Or is your main issue is even after you discover that "ort" is one of the merge strategies supported by Git, it is unclear how that short non-word was invented?

Previous: Steve SummitNext: Steve Summit
Message 2 of 4 in “suggestion for git glossary: "ort"”
  1. Steve SummitApr 16, 2022
  2. Junio C HamanoApr 16, 2022
  3. Steve SummitApr 18, 2022
  4. Junio C HamanoApr 18, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.