threads / patch / 25732

patchDocumentation/git-rebase: clarify -s option

Subject: [PATCH] Documentation/git-rebase: clarify -s option

## tl;dr

2 messages between Nov 12, 2010 and Nov 13, 2010. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Martin von Zweigbergk· Nov 12, 2010, 18:57 UTC · lore

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 <martin.von.zweigbergk@gmail.com>
---
 Documentation/git-rebase.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to Documentation/git-rebase.txt +2 −2

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

Junio C Hamano· Nov 13, 2010, 01:59 UTC · re: Martin von Zweigbergk · lore

Re: [PATCH] Documentation/git-rebase: clarify -s option

Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:

Show 21 quoted lines

> 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 <martin.von.zweigbergk@gmail.com>
> ---
>  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?