Browse Source

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>
maint
Nguyễn Thái Ngọc Duy 16 years ago committed by Junio C Hamano
parent
commit
06f391906a
  1. 3
      Documentation/git-rebase.txt

3
Documentation/git-rebase.txt

@ -231,8 +231,7 @@ OPTIONS


-s <strategy>:: -s <strategy>::
--strategy=<strategy>:: --strategy=<strategy>::
Use the given merge strategy; can be supplied more than Use the given merge strategy.
once to specify them in the order they should be tried.
If there is no `-s` option, a built-in list of strategies If there is no `-s` option, a built-in list of strategies
is used instead ('git-merge-recursive' when merging a single is used instead ('git-merge-recursive' when merging a single
head, 'git-merge-octopus' otherwise). This implies --merge. head, 'git-merge-octopus' otherwise). This implies --merge.

Loading…
Cancel
Save