[PATCH] Documentation/git-rebase: clarify -s option
From: Martin von Zweigbergk <hidden>
Date: 2016-06-15 22:50:02
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Clarify that it is '-s' itself that implies '--merge'. Currently it may seem like '--merge' is implied "If there is no `-s` option". Signed-off-by: Martin von Zweigbergk <redacted> --- Documentation/git-rebase.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 30e5c0e..f3753a8 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt@@ -244,9 +244,9 @@ other words, the sides are swapped. -s <strategy>:: --strategy=<strategy>:: - Use the given merge strategy. + Use the given merge strategy. This implies --merge. If there is no `-s` option 'git merge-recursive' is used - instead. This implies --merge. + instead. + Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using
--
1.7.3.2.167.ga361b