diff options
| author |  Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-28 20:59:26 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-04 16:10:06 -0800 |
| commit | 45e2acf3d33b2bc635f14af0c1d9ce698328954f (patch) | |
| tree | 338b3f449d1c815e15551c54dad54f755c96c43f /t/t5515/fetch.br-remote-explicit-merge | |
| parent | Makefile: do not install sourced rebase scripts (diff) | |
| download | tgif-45e2acf3d33b2bc635f14af0c1d9ce698328954f.tar.xz | |
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 <j6t@kdbg.org>
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-remote-explicit-merge')
0 files changed, 0 insertions, 0 deletions