From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com, jrnieder@gmail.com
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: [PATCH] Documentation/git-rebase: clarify -s option
Date: Fri, 12 Nov 2010 19:57:49 +0100 [thread overview]
Message-ID: <1289588269-6920-1-git-send-email-martin.von.zweigbergk@gmail.com> (raw)
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
next reply other threads:[~2010-11-13 0:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-12 18:57 Martin von Zweigbergk [this message]
2010-11-13 1:59 ` [PATCH] Documentation/git-rebase: clarify -s option Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1289588269-6920-1-git-send-email-martin.von.zweigbergk@gmail.com \
--to=martin.von.zweigbergk@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).