From: Kyle Meyer Date: Sat, 8 Dec 2018 23:15:41 +0000 (-0500) Subject: rebase docs: drop stray word in merge command description X-Git-Tag: v2.21.0-rc0~111^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57e9dcaa658b9a985f040ed764820c413835a860;p=thirdparty%2Fgit.git 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 Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 432baabe33..d6a2591105 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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).