mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-24 22:26:26 +02:00
Code

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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2009-05-21 19:47:07 +10:00 committed by Junio C Hamano
parent 581412cb02
commit 06f391906a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-rebase.txt
View File

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