summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:32 (GMT)
commitd95f610c64b9b33957beaa1da60a489d0b4aa7fc (patch)
tree7bbf24cddf3be13347ed058c11749a811e1f6759
parent6e5be1f2d5bac42c28a126d382bf7b7bdcb9b7f3 (diff)
parent57e9dcaa658b9a985f040ed764820c413835a860 (diff)
downloadgit-d95f610c64b9b33957beaa1da60a489d0b4aa7fc.zip
git-d95f610c64b9b33957beaa1da60a489d0b4aa7fc.tar.gz
git-d95f610c64b9b33957beaa1da60a489d0b4aa7fc.tar.bz2
Merge branch 'km/rebase-doc-typofix'
Doc update. * km/rebase-doc-typofix: rebase docs: drop stray word in merge command description
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index dff17b3..2ee535f 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).