| commit | c6f7de5455269ac1fcd268cd3bf592a0f74c1ef8 | |
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Sun, 6 Feb 2011 18:43:59 +0000 (6 13:43 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 22:08:10 +0000 (10 14:08 -0800) | ||
| tree | 76b9ebe22f1cccadbe3cb5b370929d298e313425 | treesnapshot (tar.gz zip) |
| parent | c5e610be5049f04b3ab8370bb8d1649347d2db87 | commitdiff |
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>
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>
| git-rebase--interactive.sh | diffblobblamehistory |