commit ce4b9e20ab203ce0bf8d8a01422c2c8d63a6cf62
Author: John Carr <john.carr@unrouted.co.uk>
Date:   Fri Nov 14 13:24:01 2008 +0000

    Don't git fetch / git rebase, git pull --rebase instead

diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py
index a29d551..2292b11 100644
--- a/jhbuild/versioncontrol/git.py
+++ b/jhbuild/versioncontrol/git.py
@@ -192,10 +192,9 @@ class GitBranch(Branch):
 
     def _update(self, buildscript, copydir=None):
         cwd = self.get_checkoutdir(copydir)
-        buildscript.execute(['git', 'fetch'], cwd=cwd)
 
         # stash uncommitted changes on the current branch
-        buildscript.execute(['git', 'stash', 'save', 'jhbuild-build'], cwd=self.get_checkoutdir())
+        buildscript.execute(['git', 'stash', 'save', 'jhbuild-build'], cwd=cwd))
 
         if self.config.sticky_date:
             commit = self._get_commit_from_date()
@@ -216,11 +215,7 @@ class GitBranch(Branch):
         else:
             buildscript.execute(['git', 'checkout'], cwd=self.srcdir)
 
-        if not self.tag:
-            if self.branch:
-                buildscript.execute(['git', 'rebase', self.branchname, self.branch], cwd=cwd)
-            else:
-                buildscript.execute(['git', 'rebase', 'origin', 'master'], cwd=cwd)
+        buildscript.execute(['git', 'pull', '--rebase'])
 
         self._update_submodules(buildscript)
 
