Skip to content

Commit 57e9dca

Browse files
kyleamgitster
authored andcommitted
rebase docs: drop stray word in merge command description
Delete a misplaced word introduced by caafecf (rebase --rebase-merges: adjust man page for octopus support, 2018-03-09). Signed-off-by: Kyle Meyer <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 98cdfbb commit 57e9dca

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ when the merge operation did not even start), it is rescheduled immediately.
971971

972972
At this time, the `merge` command will *always* use the `recursive`
973973
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
975975
this, an `exec` command can be used to call `git merge` explicitly,
976976
using the fact that the labels are worktree-local refs (the ref
977977
`refs/rewritten/onto` would correspond to the label `onto`, for example).

0 commit comments

Comments
 (0)