Re: [PATCH v3 1/4] merge-ort: barebones API of new merge strategy with empty implementation

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Oct 27, 2020, 02:33 UTC
Message-ID: <CAPig+cTkxP=aaCi8YrxbSYptkgwSYG_sd+P6FiXmtA6xuXxGSw@mail.gmail.com>
In-Reply-To: <3357ea415e3437966f15bf73fbbeb21cda3df592.1603764490.git.gitgitgadget@gmail.com>

On Mon, Oct 26, 2020 at 10:08 PM Elijah Newren via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 13 quoted lines

> + * "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"?)

You forgot:

    git merge -s newren

the "NEW Recursive ENgine" merge strategy. I won't bore you with some other backronyms I came up with[1].

FOOTNOTES

[1] Such as "Extended LInear Jump AHead", "UNabashedly Smart High INtelligence Eccentricity" and "UNsurprisingly SHallow and INsignificant Exception". Oh wait, don't read this if you don't want to be bored.