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

- From: Junio C Hamano \<hidden\>
- Date: 2021-08-04 00:33:44 
- List: git
- Page: https://ratatoskr.run/git/2021/08/7898245
- Thread: https://ratatoskr.run/git/2021/08/7898245/t.md

```text
"Elijah Newren via GitGitGadget" [ref] 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.
```