diff options
| author |  Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 13:43:59 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-10 14:08:10 -0800 |
| commit | c6f7de5455269ac1fcd268cd3bf592a0f74c1ef8 (patch) | |
| tree | 76b9ebe22f1cccadbe3cb5b370929d298e313425 /t/t5515/fetch.master_.._.git_one_two | |
| parent | git-rebase--am: remove unnecessary --3way option (diff) | |
| download | tgif-c6f7de5455269ac1fcd268cd3bf592a0f74c1ef8.tar.xz | |
rebase -i: don't read unused variable preserve_merges
Since 8e4a91b (rebase -i: remember the settings of -v, -s and -p when
interrupted, 2007-07-08), the variable preserve_merges (then called
PRESERVE_MERGES) was detected from the state saved in
$GIT_DIR/rebase-merge in order to be used when the rebase resumed, but
its value was never actually used. The variable's value was only used
when the rebase was initated.
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.master_.._.git_one_two')
0 files changed, 0 insertions, 0 deletions