From 7aab4dbe7607a89db57e10ccd0958956be4ae8ba Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Fri, 30 Nov 2012 09:37:49 +0000
Subject: Fast forward only

---
diff --git a/devbot/git.py b/devbot/git.py
index 8db61d2..e39993a 100644
--- a/devbot/git.py
+++ b/devbot/git.py
@@ -35,7 +35,7 @@ class Module:
         if self.tag:
             command.run(["git", "checkout", self.tag])
         else:
-            command.run(["git", "merge", "origin", self._branch])
+            command.run(["git", "merge", "--ff-only", "origin", self._branch])
 
     def clean(self):
         try:
--
cgit v0.9.1