From: Martin von Zweigbergk Date: Tue, 1 Mar 2011 01:59:26 +0000 (-0500) Subject: rebase: define options in OPTIONS_SPEC X-Git-Tag: v1.7.6-rc0~136^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/45e2acf3d33b2bc635f14af0c1d9ce698328954f?hp=45e2acf3d33b2bc635f14af0c1d9ce698328954f rebase: define options in OPTIONS_SPEC Interactive rebase used to have its own command line processing. Since it used the 'git rev-parse --parseopt' functionality exposed through git-sh-setup, it had some flexibility, like matching prefixes of long options, that non-interactive rebase didn't. When interactive rebase's command line processing was factored out into git-rebase.sh in cf432ca (rebase: factor out command line option processing, 2011-02-06), this flexibility was lost. Give back that flexibility to interactive and non-interactive by defining its options in OPTIONS_SPEC. Also improve the usage message to contain the --continue, --skip and --abort sub commands. Reported-by: Johannes Sixt Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano ---