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

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/examples/gitconfig b/examples/gitconfig
index 4e775fc5d452dbc96aa7be320dd6fafc13eb1b17..c61f119c3cba1597edffdab09c754d446476fa96 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -35,12 +35,11 @@
 
        # GIT pull command (should take the same arguments as
        # git-fetch or git-pull).  By default:
-       #pullcmd = git-fetch
-       #pull-does-rebase = yes
-       # Alternative (old behaviour), less intuitive but maybe useful
-       # for some workflows:
        #pullcmd = git-pull
        #pull-does-rebase = no
+       # Alternative (StGIT does the rebasing):
+       #pullcmd = git-fetch
+       #pull-does-rebase = yes
 
        # The three-way merge tool. Note that the 'output' file contains the
        # same data as 'branch1'. This is useful for tools that do not take an

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',