# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1281142254 25200
# Node ID 67b04f3c503212578be00d7bf87060e0fb1849c3
# Parent  68bf3598f3644bcc860961fe278eaffbc756f55e
dont pull from origin; there shouldnt be changes there
use --rebase flag when pulling from master, dont know why

diff -r 68bf3598f364 -r 67b04f3c5032 gut/main.py
--- a/gut/main.py	Wed Jul 21 17:30:52 2010 -0700
+++ b/gut/main.py	Fri Aug 06 17:50:54 2010 -0700
@@ -70,9 +70,8 @@
         if self.simulate:
             branch = '<branch>'
         call(['git', 'checkout', 'master'])
-        call(['git', 'pull', 'origin', 'master'])
         if self.remote:
-            call(['git', 'pull', self.remote, 'master'])
+            call(['git', 'pull', '--rebase', self.remote, 'master'])
         call(['git', 'checkout', branch])
         call(['git', 'merge', 'master'])