Use 'git-pull' rather than 'git-fetch' by default

[stgit] / stgit / config.py

diff --git a/stgit/config.py b/stgit/config.py
index fb3893253ee6be43f2e117c2cf9257b3453e978f..1c5306b64cbaa3d05f05af8789e025285d005117 100644 (file)
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -29,8 +29,8 @@ class GitConfig:
         'stgit.autoresolved':  'no',
         'stgit.smtpserver':    'localhost:25',
         'stgit.smtpdelay':     '5',
-        'stgit.pullcmd':       'git-fetch',
-        'stgit.pull-does-rebase': 'yes',
+        'stgit.pullcmd':       'git-pull',
+        'stgit.pull-does-rebase': 'no',
         'stgit.merger':                'diff3 -L current -L ancestor -L patched -m -E ' \
                                '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"',
         'stgit.autoimerge':    'no',