Re: [PATCH 03/10] Documentation: edit awkward references to `git merge-recursive`
From: Junio C Hamano <hidden>
Date: 2021-08-04 00:14:24
"Elijah Newren via GitGitGadget" [off-list ref] writes:
quoted hunk
@@ -355,8 +355,8 @@ See also INCOMPATIBLE OPTIONS below. -s <strategy>:: --strategy=<strategy>:: Use the given merge strategy. - If there is no `-s` option 'git merge-recursive' is used - instead. This implies --merge. + If there is no `-s` option the `recursive` strategy is the + default. This implies --merge.
We can depart from the original even more to make it shorter and
more readable, I think.
Use the given merge strategy, instead of the default
`recursive`. This implies `--merge`.
But the above is readable enough already, so I'll queue it as-is.