X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/8f5da35b5b53dd3c7eaf29350b3f84f1213d0ec8..d060dfd3e619d32291b872b74462a8238bf55f1b:/stgit/git.py

diff --git a/stgit/git.py b/stgit/git.py
index c7cc6a7..022d607 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -808,9 +808,9 @@ def reset(files = None, tree_id = None, check_out = True):
     if not files:
         __set_head(tree_id)
 
-def pull(repository = 'origin', refspec = None):
-    """Pull changes from the remote repository. Uses 'git-fetch'
-    and moves the stack base.
+def fetch(repository = 'origin', refspec = None):
+    """Fetches changes from the remote repository, using 'git-fetch'
+    by default.
     """
     # we update the HEAD
     __clear_head_cache()
@@ -823,10 +823,6 @@ def pull(repository = 'origin', refspec = None):
     if __run(command, args) != 0:
         raise GitException, 'Failed "%s %s"' % (command, repository)
 
-    if (config.get('stgit.pull-does-rebase')):
-        # FIXME!
-        reset(tree_id = rev_parse(repository))
-
 def repack():
     """Repack all objects into a single pack
     """