git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Wong <andrew.kw.w@gmail.com>
To: git@vger.kernel.org
Cc: Martin von Zweigbergk <martinvonz@gmail.com>,
	Andrew Wong <andrew.kw.w@gmail.com>
Subject: [PATCH 1/4] rebase usage: subcommands can not be combined with -i
Date: Mon, 17 Sep 2012 21:28:07 -0400	[thread overview]
Message-ID: <1347931690-20625-2-git-send-email-andrew.kw.w@gmail.com> (raw)
In-Reply-To: <1347931690-20625-1-git-send-email-andrew.kw.w@gmail.com>

From: Martin von Zweigbergk <martinvonz@gmail.com>

Since 95135b0 (rebase: stricter check of standalone sub command,
2011-02-06), git-rebase has not allowed to use -i together with e.g.
--continue. Yet, when rebase started using OPTIONS_SPEC in 45e2acf
(rebase: define options in OPTIONS_SPEC, 2011-02-28), the usage message
included

	git-rebase [-i] --continue | --abort | --skip

Remove the "[-i]" from this line.

Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
---
 git-rebase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 15da926..e6b43a2 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -8,7 +8,7 @@ OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-git-rebase [-i] --continue | --abort | --skip
+git-rebase --continue | --abort | --skip
 --
  Available options are
 v,verbose!         display a diffstat of what changed upstream
-- 
1.7.12.318.g79683ba.dirty

  reply	other threads:[~2012-09-18  2:29 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-10 16:14 [RFC] Add "edit" action for interactive rebase? Andrew Wong
2012-09-10 16:14 ` [PATCH] rebase -i: Teach "--edit" action Andrew Wong
2012-09-10 16:25   ` Matthieu Moy
2012-09-10 16:46     ` Andrew Wong
2012-09-10 16:54       ` Jeff King
2012-09-10 18:36         ` Johannes Sixt
2012-09-10 18:46           ` Jeff King
2012-09-10 19:33             ` Andrew Wong
2012-09-10 19:57               ` Junio C Hamano
2012-09-10 21:17                 ` Andrew Wong
2012-09-15 20:08                   ` [PATCH 0/3] rebase -i: Teach "--edit-todo" Andrew Wong
2012-09-15 20:08                     ` [PATCH 1/3] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-15 20:08                     ` [PATCH 2/3] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-16  6:54                       ` Junio C Hamano
2012-09-16 15:49                         ` Andrew Wong
2012-09-18  6:56                           ` Junio C Hamano
2012-09-15 20:08                     ` [PATCH 3/3] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-16  6:58                       ` Junio C Hamano
2012-09-16 15:17                         ` [PATCH v2 1/3] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-16 15:17                           ` [PATCH v2 2/3] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-17  6:11                             ` Martin von Zweigbergk
2012-09-18  1:28                               ` [PATCH v3 0/4] " Andrew Wong
2012-09-18  1:28                                 ` Andrew Wong [this message]
2012-09-18  1:28                                 ` [PATCH 2/4] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-18  1:28                                 ` [PATCH 3/4] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-18  1:28                                 ` [PATCH 4/4] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-18  4:58                                   ` Martin von Zweigbergk
2012-09-18  5:23                                     ` Andrew Wong
2012-09-18  5:37                                       ` Martin von Zweigbergk
2012-09-19  6:43                                 ` [PATCH 5/4] rebase -i: suggest using --edit-todo to fix an unknown instruction Johannes Sixt
2012-09-19 19:52                                   ` Junio C Hamano
2012-09-16 15:17                           ` [PATCH v2 3/3] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-10 18:28 ` [RFC] Add "edit" action for interactive rebase? Johannes Sixt
2012-09-10 20:13   ` Andrew Wong

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=1347931690-20625-2-git-send-email-andrew.kw.w@gmail.com \
    --to=andrew.kw.w@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=martinvonz@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).