diff options
Diffstat (limited to 'devbot/git.py')
| -rw-r--r-- | devbot/git.py | 3 |
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): |