Make 'stg pull' use git-fetch and not git-pull.

[stgit] / stgit / config.py

diff --git a/stgit/config.py b/stgit/config.py
index 901f60092abc715c0ee3b7fabb32660dec444cf7..48b4e2d03aa5bebccf5f1316d1ccd6f2c53d4298 100644 (file)
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -29,7 +29,8 @@ class GitConfig:
         'stgit.autoresolved':  'no',
         'stgit.smtpserver':    'localhost:25',
         'stgit.smtpdelay':     '5',
         'stgit.autoresolved':  'no',
         'stgit.smtpserver':    'localhost:25',
         'stgit.smtpdelay':     '5',

-        'stgit.pullcmd':       'git-pull',
+        'stgit.pullcmd':       'git-fetch',
+        'stgit.pull-does-rebase': 'yes',

         'stgit.merger':                'diff3 -L current -L ancestor -L patched -m -E ' \
                                '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"',
         'stgit.autoimerge':    'no',
         'stgit.merger':                'diff3 -L current -L ancestor -L patched -m -E ' \
                                '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"',
         'stgit.autoimerge':    'no',