development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase -i: don't read unused variable preserve_merges

Browse source 
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>
This commit is contained in:
Martin von Zweigbergk 2011-02-06 13:43:59 -05:00 committed by Junio C Hamano
parent c5e610be50
commit c6f7de5455
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
git-rebase--interactive.sh
View file

@ -583,7 +583,6 @@ skip_unnecessary_picks () {
}
get_saved_options () {
test -d "$rewritten" && preserve_merges=t
test -f "$state_dir"/rebase-root && rebase_root=t
}