Hi Elijah, On Wed, 11 Jul 2018, Elijah Newren wrote:
> On Fri, Mar 9, 2018 at 8:36 AM, Johannes Schindelin via GitGitGadget > <gitgitgad...@gmail.com> wrote: > > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > > index 0e20a66e7..c4bcd24bb 100644 > > --- a/Documentation/git-rebase.txt > > +++ b/Documentation/git-rebase.txt > > @@ -889,7 +889,8 @@ If a `merge` command fails for any reason other than > > merge conflicts (i.e. > > when the merge operation did not even start), it is rescheduled > > immediately. > > > > At this time, the `merge` command will *always* use the `recursive` > > -merge strategy, with no way to choose a different one. To work around > > +merge strategy for regular merges, and `octopus` for octopus merges, > > +strategy, with no way to choose a different one. To work around > > The "...merges, strategy, with..." looks like an incomplete edit. > Perhaps "...and `octopus` strategy for octopus merges, with no way..." > ? Okay. Will be fixed in v2. Ciao, Dscho
