Signed-off-by: Yann Dirson <ydirson@xxxxxxxxxx>
---
stgit/commands/pull.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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'
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html