Skip to content

Commit bf312dc

Browse files
committed
installer: properly save fast-forward only choice
6ab14d9 (installer: allow configuring the default behavior of `git pull`, 2020-05-19) introduced radio buttons to select how `git pull` behaves by default. The `fast-forward only` option currently gets wrongly saved as `merge`, though. Signed-off-by: Matthias Aßhauer <[email protected]>
1 parent 5147709 commit bf312dc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

installer/install.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3130,7 +3130,7 @@ begin
31303130
Data:='Merge';
31313131
if RdbGitPullBehavior[GP_GitPullRebase].Checked then begin
31323132
Data:='Rebase'
3133-
end else if RdbGitPullBehavior[GP_GitPullRebase].Checked then begin
3133+
end else if RdbGitPullBehavior[GP_GitPullFFOnly].Checked then begin
31343134
Data:='FFOnly'
31353135
end;
31363136
RecordChoice(PreviousDataKey,'Git Pull Behavior Option',Data);

0 commit comments

Comments
 (0)