rebase docs: drop stray word in merge command description
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> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kyle Meyer committed
Dec 8, 2018 at 18:15 UTC
57e9dcaa658b9a985f040ed764820c413835a860
1 file changed
+1
-1
Documentation/git-rebase.txt
+1
-1
@@ -971,7 +971,7 @@ when the merge operation did not even start), it is rescheduled immediately.
971
972
At this time, the `merge` command will *always* use the `recursive`
973
merge strategy for regular merges, and `octopus` for octopus merges,
974
-strategy, with no way to choose a different one. To work around
974
+with no way to choose a different one. To work around
975
this, an `exec` command can be used to call `git merge` explicitly,
976
using the fact that the labels are worktree-local refs (the ref
977
`refs/rewritten/onto` would correspond to the label `onto`, for example).