* [PATCH] Documentation/git-rebase: clarify -s option
@ 2010-11-12 18:57 Martin von Zweigbergk
2010-11-13 1:59 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Martin von Zweigbergk @ 2010-11-12 18:57 UTC (permalink / raw)
To: git, gitster, jrnieder; +Cc: Martin von Zweigbergk
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.
+
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Documentation/git-rebase: clarify -s option
2010-11-12 18:57 [PATCH] Documentation/git-rebase: clarify -s option Martin von Zweigbergk
@ 2010-11-13 1:59 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2010-11-13 1:59 UTC (permalink / raw)
To: Martin von Zweigbergk; +Cc: git, jrnieder
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
> 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?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-13 2:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-12 18:57 [PATCH] Documentation/git-rebase: clarify -s option Martin von Zweigbergk
2010-11-13 1:59 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).