提交 57e9dcaa 编写于 作者: K Kyle Meyer 提交者: Junio C Hamano

rebase docs: drop stray word in merge command description

Delete a misplaced word introduced by caafecfc (rebase
--rebase-merges: adjust man page for octopus support, 2018-03-09).
Signed-off-by: NKyle Meyer <kyle@kyleam.com>
Acked-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 98cdfbb8
......@@ -971,7 +971,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).
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册