We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 581412c commit 06f3919Copy full SHA for 06f3919
Documentation/git-rebase.txt
@@ -231,8 +231,7 @@ OPTIONS
231
232
-s <strategy>::
233
--strategy=<strategy>::
234
- Use the given merge strategy; can be supplied more than
235
- once to specify them in the order they should be tried.
+ Use the given merge strategy.
236
If there is no `-s` option, a built-in list of strategies
237
is used instead ('git-merge-recursive' when merging a single
238
head, 'git-merge-octopus' otherwise). This implies --merge.
0 commit comments