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>
Nguyễn Thái Ngọc Duy committed
May 21, 2009 at 19:47 UTC
06f391906a69e410c9a6ca5e13774529a091385d
1 file changed
+1
-2
Documentation/git-rebase.txt
+1
-2
@@ -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.
234
+ Use the given merge strategy.
235
If there is no `-s` option, a built-in list of strategies
236
is used instead ('git-merge-recursive' when merging a single
237
head, 'git-merge-octopus' otherwise). This implies --merge.