rebase usage: subcommands can not be combined with -i
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk committed
Sep 17, 2012 at 21:28 UTC
6ef59319438ba89bf2979baa86fdb9bd1922f659
1 file changed
+1
-1
git-rebase.sh
+1
-1
@@ -8,7 +8,7 @@ OPTIONS_KEEPDASHDASH=
8
OPTIONS_SPEC="\
9
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
10
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
11
-git-rebase [-i] --continue | --abort | --skip
11
+git-rebase --continue | --abort | --skip
12
--
13
Available options are
14
v,verbose! display a diffstat of what changed upstream