summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
Diffstat (limited to 'project.py')
-rw-r--r--project.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/project.py b/project.py
index bd35c65e..6ffbd023 100644
--- a/project.py
+++ b/project.py
@@ -893,11 +893,11 @@ class Project(object):
893 raise GitError('%s reset --hard %s ' % (self.name, rev)) 893 raise GitError('%s reset --hard %s ' % (self.name, rev))
894 894
895 def _Rebase(self, upstream, onto = None): 895 def _Rebase(self, upstream, onto = None):
896 cmd = ['rebase', '-i'] 896 cmd = ['rebase']
897 if onto is not None: 897 if onto is not None:
898 cmd.extend(['--onto', onto]) 898 cmd.extend(['--onto', onto])
899 cmd.append(upstream) 899 cmd.append(upstream)
900 if GitCommand(self, cmd, disable_editor=True).Wait() != 0: 900 if GitCommand(self, cmd).Wait() != 0:
901 raise GitError('%s rebase %s ' % (self.name, upstream)) 901 raise GitError('%s rebase %s ' % (self.name, upstream))
902 902
903 def _FastForward(self, head): 903 def _FastForward(self, head):