diff options
| -rw-r--r-- | project.py | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -2584,7 +2584,7 @@ class Project(object): | |||
| 2584 | raise GitError('%s rebase %s ' % (self.name, upstream)) | 2584 | raise GitError('%s rebase %s ' % (self.name, upstream)) |
| 2585 | 2585 | ||
| 2586 | def _FastForward(self, head, ffonly=False): | 2586 | def _FastForward(self, head, ffonly=False): |
| 2587 | cmd = ['merge', head] | 2587 | cmd = ['merge', '--no-stat', head] |
| 2588 | if ffonly: | 2588 | if ffonly: |
| 2589 | cmd.append("--ff-only") | 2589 | cmd.append("--ff-only") |
| 2590 | if GitCommand(self, cmd).Wait() != 0: | 2590 | if GitCommand(self, cmd).Wait() != 0: |
