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

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index ee68d07..60f6e85 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -33,8 +33,14 @@
        #pager = ~/share/stgit/contrib/diffcol.sh
        #pager = filterdiff --annotate | colordiff | less -FRX
 
-       # GIT pull command (should take the same arguments as git-pull)
+       # 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
 
        # 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