![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Tue, 28 Dec 2010 09:30:47 +0000 (10:30 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 23:05:47 +0000 (15:05 -0800) | ||
| commit | 9c9214a27f98f7335b23aa6ac7734757dd842024 | |
| tree | b3d8db7e23befae9fd8d238c8af4fbceeabe0208 | tree | snapshot |
| parent | 322a42bf1b5292a18e1ff0b91a08d00ec68ffe95 | commit | diff |
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 | diff | blob | history |