From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Thu, 21 May 2009 09:47:07 +0000 (+1000)
Subject: doc/git-rebase.txt: remove mention of multiple strategies
X-Git-Tag: v1.6.4-rc0~148
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06f391906a69e410c9a6ca5e13774529a091385d;p=git.git

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>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3d5a066c3..26f3b7b2b 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -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.