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.