diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2018-12-08 23:15:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-10 03:31:51 (GMT) |
| commit | 57e9dcaa658b9a985f040ed764820c413835a860 (patch) | |
| tree | 9d8df3c2a8f0389eed6f9c14bf00d775ef5ef564 /Documentation/git-rebase.txt | |
| parent | 98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad (diff) | |
| download | git-57e9dcaa658b9a985f040ed764820c413835a860.zip git-57e9dcaa658b9a985f040ed764820c413835a860.tar.gz git-57e9dcaa658b9a985f040ed764820c413835a860.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 432baab..d6a2591 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). |