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

[stgit] / examples / gitconfig

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:
 
        # 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
        #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
 
        # 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