Merge pull request #70 from coopiteasy/pull_ensure_default_ff

ensure default pull fast-forward behavior

Author: lmignon

git_aggregator/repo.py

@@ -304,7 +304,7 @@ def _execute_shell_command_after(self):
 
     def _merge(self, merge):
         logger.info("Pull %s, %s", merge["remote"], merge["ref"])
-        cmd = ("git", "pull", "--no-rebase")
+        cmd = ("git", "pull", "--ff", "--no-rebase")
         if self.git_version >= (1, 7, 10):
             # --edit and --no-edit appear with Git 1.7.10
             # see Documentation/RelNotes/1.7.10.txt of Git