On Tue, Aug 3, 2021 at 6:33 PM Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
>
> > --merge::
> > - Use merging strategies to rebase. When the recursive (default) merge
> > - strategy is used, this allows rebase to be aware of renames on the
> > - upstream side. This is the default.
> > + Use merging strategies to rebase. When either the `recursive`
> > + (default) or `ort` merge strategy is used, this allows rebase
> > + to be aware of renames on the upstream side. This is the
> > + default.
>
> The "this is the default" at the end is about --merge vs format-patch|am,
> so it should come near "Use merging strategies to rebase".
>
> Use merging strategies to rebase (default). Renames on the
> upstream side is taken into account when the `recursive`
> (default) or `ort` merge strategy is used.
We can simplify this to just:
Use merging strategies to rebase (default).
because when git-am -3 was switched from `resolve` to `recursive` in
Dec 2006, it too gained the ability to handle renames and made the
rest of this description for --merge obsolete.
