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.
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index aa2f41f..cb0726f 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -287,6 +287,13 @@ This commit is referred to as a "merge commit", or sometimes just a origin/name-of-upstream-branch, which you can see using `git branch -r`. +[[def_ort]]ort:: + The default merge strategy when pulling or merging one branch. + An acronym for "Ostensibly Recursive's Twin", due to the fact + that it was written as a replacement for the previous default + algorithm, `recursive`. See linkgit:git-merge[1], section + "Merge Strategies". + [[def_overlay]]overlay:: Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents
