Merge pull request #292 from rimrul/pull-option-fix

Pull option fix

Author: dscho

installer/install.iss

@@ -803,6 +803,15 @@ begin
                             'true': RecordInferredDefault('Enable Symlinks','Enabled');
                             'false': RecordInferredDefault('Enable Symlinks','Disabled');
                         end;
+                    'pull.ff':
+                        case Value of
+                            'only': RecordInferredDefault('Git Pull Behavior Option','FFOnly');
+                        end;
+                    'pull.rebase':
+                        case Value of
+                            'true': RecordInferredDefault('Git Pull Behavior Option','Rebase');
+                            'false': RecordInferredDefault('Git Pull Behavior Option','Merge');
+                        end;
                 end;
             end;
             i:=j+1;
@@ -3130,7 +3139,7 @@ begin
     Data:='Merge';
     if RdbGitPullBehavior[GP_GitPullRebase].Checked then begin
         Data:='Rebase'
-    end else if RdbGitPullBehavior[GP_GitPullRebase].Checked then begin
+    end else if RdbGitPullBehavior[GP_GitPullFFOnly].Checked then begin
         Data:='FFOnly'
     end;
     RecordChoice(PreviousDataKey,'Git Pull Behavior Option',Data);