Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'km/rebase-doc-typofix'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 14 Jan 2019 23:29:32 +0000
(15:29 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 14 Jan 2019 23:29:32 +0000
(15:29 -0800)
Doc update.
* km/rebase-doc-typofix:
rebase docs: drop stray word in merge command description
Documentation/git-rebase.txt
patch
|
blob
|
history
raw
(from parent 1:
6e5be1f
)
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index dff17b31788fec085b91314b3b3328c689050628..2ee535fb23edc3aec9b8ceb5dace10279567f7ba 100644
(file)
--- 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).