Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/devbot/git.py
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-11-30 09:55:27 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-11-30 09:55:27 (GMT)
commit43ddaef92555c1f364f5bbed8b19d136a5e746fb (patch)
treece6e174a0872c1a3d0a38327e7cec03888ddc2f8 /devbot/git.py
parent37e8f0d9caa2cc3f212ec3d926d53acd47c3fee1 (diff)
Fix merge command
Diffstat (limited to 'devbot/git.py')
-rw-r--r--devbot/git.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/devbot/git.py b/devbot/git.py
index f1a7acc..b3f3594 100644
--- a/devbot/git.py
+++ b/devbot/git.py
@@ -39,7 +39,8 @@ class Module:
if self.tag:
command.run(["git", "checkout", self.tag])
else:
- command.run(["git", "merge", "--ff-only", "origin", self._branch],
+ command.run(["git", "merge", "--ff-only",
+ "origin/%s" % self._branch],
retry=self._retry)
def clean(self):