diff options
| author | Martin von Zweigbergk <martinvonz@gmail.com> | 2012-09-17 21:28:07 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 20:58:36 -0700 |
| commit | 6ef59319438ba89bf2979baa86fdb9bd1922f659 (patch) | |
| tree | de470b725b040af53426dfcfba24bee854fb7666 /git-rebase.sh | |
| parent | 83379df0251243b5e1f328598bfdd39327766df3 (diff) | |
| download | git-6ef59319438ba89bf2979baa86fdb9bd1922f659.tar.gz | |
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>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 15da926ce0..e6b43a26cf 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 |