rebase usage: subcommands can not be combined with -i
authorMartin von Zweigbergk <martinvonz@gmail.com>
Tue, 18 Sep 2012 01:28:07 +0000 (21:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Sep 2012 03:58:36 +0000 (20:58 -0700)
commit6ef59319438ba89bf2979baa86fdb9bd1922f659
treede470b725b040af53426dfcfba24bee854fb7666
parent83379df0251243b5e1f328598bfdd39327766df3
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>
git-rebase.sh