diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-30 09:37:49 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-30 09:37:49 (GMT) |
| commit | 7aab4dbe7607a89db57e10ccd0958956be4ae8ba (patch) | |
| tree | 8d670c5edd640a0ad5e724e3358f3ea0c280292b /devbot/git.py | |
| parent | dda884a8d6b331701f4c05d0d64fa3212771d01e (diff) | |
Fast forward only
Diffstat (limited to 'devbot/git.py')
| -rw-r--r-- | devbot/git.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |