| commit | 5166810b1e16b22e342f2181a3535e70c6e7a119 | |
| author | Matt Kraai <kraai@ftbfs.org> | |
| Wed, 26 Sep 2007 01:30:13 +0000 (25 18:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Sep 2007 07:39:09 +0000 (26 00:39 -0700) | ||
| tree | 68865d516bbd5e522a0f5a4552076f6ea0b24de8 | treesnapshot (tar.gz zip) |
| parent | ae830ed7f50377e64b774ce87441ff4538f04ad7 | commitdiff |
rebase -i: create .dotest-merge after validating options.
Creating .dotest-merge before validating the options prevents both
--continue and --interactive from working if the options are invalid,
so only create it after validating the options.
[jc: however, just moving the creation of DOTEST breaks output]
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Creating .dotest-merge before validating the options prevents both
--continue and --interactive from working if the options are invalid,
so only create it after validating the options.
[jc: however, just moving the creation of DOTEST breaks output]
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |