Re: [PATCH] rebase docs: drop stray word in merge command description

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 9, 2018, 19:41 UTC
Message-ID: <nycvar.QRO.7.76.6.1812092040320.43@tvgsbejvaqbjf.bet>
In-Reply-To: <20181208231541.1341999-1-kyle@kyleam.com>

Hi Kyle,

On Sat, 8 Dec 2018, Kyle Meyer wrote:

> Delete a misplaced word introduced by caafecfcf1 (rebase
> --rebase-merges: adjust man page for octopus support, 2018-03-09).
> 
> Signed-off-by: Kyle Meyer <kyle@kyleam.com>

ACK.

Too bad this did not make it into v2.20.0, but at least it can make it into a future version.

Thanks, Johannes

Show 21 quoted lines

> ---
>  Documentation/git-rebase.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index dff17b3178..2ee535fb23 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -979,7 +979,7 @@ 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 for regular merges, and `octopus` for octopus merges,
> -strategy, with no way to choose a different one. To work around
> +with no way to choose a different one. To work around
>  this, an `exec` command can be used to call `git merge` explicitly,
>  using the fact that the labels are worktree-local refs (the ref
>  `refs/rewritten/onto` would correspond to the label `onto`, for example).
> -- 
> 2.19.2
> 
>