{"thread":{"id":"25732","subject":"[PATCH] Documentation/git-rebase: clarify -s option","startedAt":"2010-11-12T18:57:49Z","lastAt":"2010-11-13T01:59:58Z","messageCount":2,"participants":["Martin von Zweigbergk","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"155812","messageId":"1289588269-6920-1-git-send-email-martin.von.zweigbergk@gmail.com","threadId":"25732","inReplyTo":null,"subject":"[PATCH] Documentation/git-rebase: clarify -s option","fromName":"Martin von Zweigbergk","fromEmail":"martin.von.zweigbergk@gmail.com","sentAt":"2010-11-12T18:57:49Z","receivedAt":"2010-11-12T18:57:49Z","isPatch":true,"sender":{"key":"martinvonz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/891642?v=4"},"body":"Clarify that it is '-s' itself that implies '--merge'. Currently it may\nseem like '--merge' is implied \"If there is no `-s` option\".\n\nSigned-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>\n---\n Documentation/git-rebase.txt |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 30e5c0e..f3753a8 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -244,9 +244,9 @@ other words, the sides are swapped.\n \n -s <strategy>::\n --strategy=<strategy>::\n-\tUse the given merge strategy.\n+\tUse the given merge strategy.  This implies --merge.\n \tIf there is no `-s` option 'git merge-recursive' is used\n-\tinstead.  This implies --merge.\n+\tinstead.\n +\n Because 'git rebase' replays each commit from the working branch\n on top of the <upstream> branch using the given strategy, using\n-- \n1.7.3.2.167.ga361b\n"},{"id":"155817","messageId":"7vtyjmdlup.fsf@alter.siamese.dyndns.org","threadId":"25732","inReplyTo":"1289588269-6920-1-git-send-email-martin.von.zweigbergk@gmail.com","subject":"Re: [PATCH] Documentation/git-rebase: clarify -s option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-11-13T01:59:58Z","receivedAt":"2010-11-13T01:59:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:\n\n> Clarify that it is '-s' itself that implies '--merge'. Currently it may\n> seem like '--merge' is implied \"If there is no `-s` option\".\n>\n> Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>\n> ---\n>  Documentation/git-rebase.txt |    4 ++--\n>  1 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index 30e5c0e..f3753a8 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -244,9 +244,9 @@ other words, the sides are swapped.\n>  \n>  -s <strategy>::\n>  --strategy=<strategy>::\n> -\tUse the given merge strategy.\n> +\tUse the given merge strategy.  This implies --merge.\n>  \tIf there is no `-s` option 'git merge-recursive' is used\n> -\tinstead.  This implies --merge.\n> +\tinstead.\n\nThe first change is absolutely right---thanks for starting this.  However,\n\"if there is no `-s`...\" describes the default when `--merge` alone is\ngiven, so these last two lines may need to move elsewhere, no?\n"}]}