Skip to content

Commit 06f3919

Browse files
pcloudsgitster
authored andcommitted
doc/git-rebase.txt: remove mention of multiple strategies
git-rebase.sh does not seem to support this. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 581412c commit 06f3919

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

Documentation/git-rebase.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ OPTIONS
231231

232232
-s <strategy>::
233233
--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.
234+
Use the given merge strategy.
236235
If there is no `-s` option, a built-in list of strategies
237236
is used instead ('git-merge-recursive' when merging a single
238237
head, 'git-merge-octopus' otherwise). This implies --merge.

0 commit comments

Comments
 (0)