summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorLibravatar Simon Hausmann <shausman@trolltech.com>2007-06-07 12:51:03 +0200
committerLibravatar Simon Hausmann <shausman@trolltech.com>2007-06-07 12:51:03 +0200
commit68c42153060cab9ea6c16256febcf736a2a710d9 (patch)
tree7af85c936aa9450fe63e1b29207efe1a9f68d53e /contrib/fast-import
parentHack to make the multi-branch import work again with self.depotPaths now that (diff)
downloadtgif-68c42153060cab9ea6c16256febcf736a2a710d9.tar.xz
Fix git-p4 rebase
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p41
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index ececc44518..50d92c0f42 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1320,6 +1320,7 @@ class P4Rebase(Command):
self.options = [ ]
self.description = ("Fetches the latest revision from perforce and "
+ "rebases the current work (branch) against it")
+ self.verbose = False
def run(self, args):
sync = P4Sync()