Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devbot/git.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/devbot/git.py b/devbot/git.py
index b3f3594..e0519da 100644
--- a/devbot/git.py
+++ b/devbot/git.py
@@ -40,8 +40,7 @@ class Module:
command.run(["git", "checkout", self.tag])
else:
command.run(["git", "merge", "--ff-only",
- "origin/%s" % self._branch],
- retry=self._retry)
+ "origin/%s" % self._branch])
def clean(self):
try: