From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v0 1/3] doc/git-rebase.txt: remove mention of multiple strategies
Date: Thu, 21 May 2009 19:47:07 +1000 [thread overview]
Message-ID: <1242899229-27603-1-git-send-email-pclouds@gmail.com> (raw)
git-rebase.sh does not seem to support this.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
I have starred at git-rebase.sh many times and still don't know how
it can do multiple strategies. So assume it's wrong, remove it.
Documentation/git-rebase.txt | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3d5a066..26f3b7b 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -231,8 +231,7 @@ OPTIONS
-s <strategy>::
--strategy=<strategy>::
- Use the given merge strategy; can be supplied more than
- once to specify them in the order they should be tried.
+ Use the given merge strategy.
If there is no `-s` option, a built-in list of strategies
is used instead ('git-merge-recursive' when merging a single
head, 'git-merge-octopus' otherwise). This implies --merge.
--
test
next reply other threads:[~2009-05-21 9:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 9:47 Nguyễn Thái Ngọc Duy [this message]
2009-05-21 9:47 ` [PATCH v0 2/3] t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C Nguyễn Thái Ngọc Duy
2009-05-21 9:47 ` [PATCH v0 3/3] Build in git-rebase.sh Nguyễn Thái Ngọc Duy
2009-05-21 10:25 ` Jakub Narebski
2009-05-21 10:44 ` Nguyen Thai Ngoc Duy
2009-05-21 12:29 ` Jakub Narebski
2009-05-21 22:57 ` Nguyen Thai Ngoc Duy
2009-05-21 14:39 ` Junio C Hamano
2009-05-22 6:56 ` Johannes Sixt
2009-05-22 7:30 ` Nguyen Thai Ngoc Duy
2009-05-23 9:26 ` Nguyen Thai Ngoc Duy
2009-05-23 14:50 ` Nguyen Thai Ngoc Duy
2009-05-25 6:16 ` Johannes Sixt
2009-05-25 6:34 ` Nguyen Thai Ngoc Duy
2009-05-25 6:47 ` Johannes Sixt
2009-05-25 7:00 ` Nguyen Thai Ngoc Duy
2009-05-25 7:39 ` Nguyen Thai Ngoc Duy
2009-05-21 10:22 ` [PATCH v0 2/3] t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C Jakub Narebski
2009-05-21 10:39 ` Nguyen Thai Ngoc Duy
2009-05-21 14:22 ` Junio C Hamano
2009-05-23 15:31 ` [PATCH " Nguyễn Thái Ngọc Duy
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=1242899229-27603-1-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).