X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/76c57fcf79ac80726e2435f6db9e4a5fd892eb75..57f3e325b9f45dc2c7fd0415bb646179bc37b3bf:/stgit/commands/pull.py diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py index 330cc25..b63ef7a 100644 --- a/stgit/commands/pull.py +++ b/stgit/commands/pull.py @@ -73,8 +73,8 @@ def func(parser, options, args): print 'Pulling from "%s"...' % repository git.fetch(repository) if (config.get('stgit.pull-does-rebase') == 'yes'): - print "rebasing to '%s'..." % crt_series.get_parent_branch() - git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch())) + print 'rebasing to "%s"...' % git.fetch_head() + git.reset(tree_id = git.fetch_head()) print 'done' # push the patches back