Re: [PATCH] Documentation/git-rebase: clarify -s option
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:02
Martin von Zweigbergk [off-list ref] writes:
quoted hunk
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.
The first change is absolutely right---thanks for starting this. However, "if there is no `-s`..." describes the default when `--merge` alone is given, so these last two lines may need to move elsewhere, no?