diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-08 03:02:47 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-07-08 18:24:19 -0700 |
| commit | 8e4a91bd780b89c7337f281a8601f2e0cae108fc (patch) | |
| tree | c089102c6f0fdaa175ca0a78629aa937f584fdda /builtin-fmt-merge-msg.c | |
| parent | rebase -i: actually show the diffstat when being verbose (diff) | |
| download | tgif-8e4a91bd780b89c7337f281a8601f2e0cae108fc.tar.xz | |
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>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions