| commit | 8e4a91bd780b89c7337f281a8601f2e0cae108fc | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Sun, 8 Jul 2007 02:02:47 +0000 (8 03:02 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jul 2007 01:24:19 +0000 (8 18:24 -0700) | ||
| tree | c089102c6f0fdaa175ca0a78629aa937f584fdda | treesnapshot (tar.gz zip) |
| parent | 3df0a859aa5cc68a2bd616cb686f01cf0e2468c1 | commitdiff |
rebase -i: remember the settings of -v, -s and -p when interrupted
After interruption, be that an edit, or a conflicting commit, reset
the variables VERBOSE, STRATEGY and PRESERVE_MERGES, so that the
user does not have to respecify them with "rebase --continue".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
After interruption, be that an edit, or a conflicting commit, reset
the variables VERBOSE, STRATEGY and PRESERVE_MERGES, so that the
user does not have to respecify them with "rebase --continue".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |