development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'km/rebase-doc-typofix'

Browse source 
Doc update.

* km/rebase-doc-typofix:
  rebase docs: drop stray word in merge command description
This commit is contained in:
Junio C Hamano 2019-01-14 15:29:32 -08:00
parent 6e5be1f2d5 57e9dcaa65
commit d95f610c64
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/git-rebase.txt
View file

@ -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).