Mercurial > hg > gut
changeset 12:67b04f3c5032 default tip
dont pull from origin; there shouldnt be changes there
use --rebase flag when pulling from master, dont know why
| author | Jeff Hammel <jhammel@mozilla.com> |
|---|---|
| date | Fri, 06 Aug 2010 17:50:54 -0700 |
| parents | 68bf3598f364 |
| children | |
| files | gut/main.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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'])