X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d060dfd3e619d32291b872b74462a8238bf55f1b..76c57fcf79ac80726e2435f6db9e4a5fd892eb75:/stgit/commands/pull.py diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py index 15bbed6..330cc25 100644 --- a/stgit/commands/pull.py +++ b/stgit/commands/pull.py @@ -72,7 +72,8 @@ def func(parser, options, args): # pull the remote changes print 'Pulling from "%s"...' % repository git.fetch(repository) - if (config.get('stgit.pull-does-rebase')): + 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 'done'