|
@@ -2584,7 +2584,7 @@ class Project(object):
|
|
|
raise GitError('%s rebase %s ' % (self.name, upstream))
|
|
raise GitError('%s rebase %s ' % (self.name, upstream))
|
|
|
|
|
|
|
|
def _FastForward(self, head, ffonly=False):
|
|
def _FastForward(self, head, ffonly=False):
|
|
|
- cmd = ['merge', head]
|
|
|
|
|
|
|
+ cmd = ['merge', '--no-stat', head]
|
|
|
if ffonly:
|
|
if ffonly:
|
|
|
cmd.append("--ff-only")
|
|
cmd.append("--ff-only")
|
|
|
if GitCommand(self, cmd).Wait() != 0:
|
|
if GitCommand(self, cmd).Wait() != 0:
|