Fixes for gitolite synchronization script

- Typo in the variable used, caused by bad refactoring skills.
- Explicitly do pull rebase semantic.

scripts/gitolite/rebuild_gitolite.php

@@ -324,19 +324,19 @@ function handleCustomPolicy($config, $policy) {
     $rule_type = $rule['rule'];
     if ($rule_type == 'PhabricatorPolicyRuleUsers') {
       $policy_config_user_names =
-          handleUsersPolicyRule($system_keys, $used_keys);
+          handleUsersPolicyRule($system_keys, $rule);
     } else if ($rule_type == 'PhabricatorProjectsPolicyRule') {
       $policy_config_user_names =
-          handleProjectsPolicyRule($system_keys, $used_keys);
+          handleProjectsPolicyRule($system_keys, $rule);
     } else if ($rule_type == 'PhabricatorProjectsAllPolicyRule') {
       $policy_config_user_names =
-          handleProjectsAllPolicyRule($system_keys, $used_keys);
+          handleProjectsAllPolicyRule($system_keys, $rule);
     } else if ($rule_type == 'PhabricatorAdministratorsPolicyRule') {
       $policy_config_user_names =
-          handleAdministratorsPolicyRule($system_keys, $used_keys);
+          handleAdministratorsPolicyRule($system_keys, $rule);
     } else if ($rule_type == 'PhabricatorLegalpadSignaturePolicyRule') {
       $policy_config_user_names =
-          handleLegalpadSignaturePolicyRule($system_keys, $used_keys);
+          handleLegalpadSignaturePolicyRule($system_keys, $rule);
     }
 
     $config_user_names = array_merge(
@@ -432,7 +432,7 @@ function runGitSshCommand($repository, $key, $arguments,
 }
 
 function repositoryPull($repository, $key) {
-  return runGitSshCommand($repository, $key, 'pull');
+  return runGitSshCommand($repository, $key, 'pull --rebase');
 }
 
 function repositoryCommitAll($repository, $author, $message) {