From: Nguyễn Thái Ngọc Duy Date: Thu, 21 May 2009 09:47:07 GMT Subject: [PATCH v0 1/3] doc/git-rebase.txt: remove mention of multiple strategies Message-ID: <1242899229-27603-1-git-send-email-pclouds@gmail.com> git-rebase.sh does not seem to support this. Signed-off-by: Nguyễn Thái Ngọc Duy --- I have starred at git-rebase.sh many times and still don't know how it can do multiple strategies. So assume it's wrong, remove it. Documentation/git-rebase.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 3d5a066..26f3b7b 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -231,8 +231,7 @@ OPTIONS -s :: --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. -- test