Re: [PATCH] Documentation/git-rebase: clarify -s option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 13, 2010, 01:59 UTC
- Message-ID
- <7vtyjmdlup.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1289588269-6920-1-git-send-email-martin.von.zweigbergk@gmail.com>
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?