[PATCH v0 1/3] doc/git-rebase.txt: remove mention of multiple strategies
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:46:48
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
git-rebase.sh does not seem to support this. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- 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>:: --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.
--
test