Re: [PATCH 09/10] Documentation: add coverage of the `ort` merge strategy

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 4, 2021, 00:33 UTC
Message-ID: <xmqq8s1irqu9.fsf@gitster.g>
In-Reply-To: <37a69fd2e0bdb7fba6b6c47c3edec0964165cb61.1628004920.git.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 8 quoted lines

>  --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.