On Mon, Oct 26, 2020 at 7:33 PM Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > > On Mon, Oct 26, 2020 at 10:08 PM Elijah Newren via GitGitGadget > <gitgitgadget@xxxxxxxxx> wrote: > > + * "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. Haha, those are great! :-) Maybe we should come up with one for TUFF?
