X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d060dfd3e619d32291b872b74462a8238bf55f1b..refs/heads/master:/stgit/commands/pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 15bbed6..b63ef7a 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -72,8 +72,9 @@ def func(parser, options, args):
     # pull the remote changes
     print 'Pulling from "%s"...' % repository
     git.fetch(repository)
-    if (config.get('stgit.pull-does-rebase')):
-        git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch()))
+    if (config.get('stgit.pull-does-rebase') == 'yes'):
+        print 'rebasing to "%s"...' % git.fetch_head()
+        git.reset(tree_id = git.fetch_head())
     print 'done'
 
     # push the patches back