X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/c6f366f6b7452e24edf5bff06da8b69c500899a4..e0bbefddad17255e8905d7a6b7aaaed910168c4c:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index ee68d07..4e775fc 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -33,22 +33,30 @@
 	#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
 	# output parameter
 	#merger = diff3 -L current -L ancestor -L patched -m -E \
-	#	"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
+	#	\"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
+	#	> \"%(output)s\"
 
 	# Interactive three-way merge tool. It is executed by the 'resolved
 	# --interactive' command
 	#imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
-	#	--show-merged-pane -m -E -O -X -M "%(output)s" \
-	#	"%(branch1)s" "%(ancestor)s" "%(branch2)s"
+	#	--show-merged-pane -m -E -O -X -M \"%(output)s\" \
+	#	\"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"
 	#imerger = emacs --eval '(ediff-merge-files-with-ancestor \
-	#	"%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
+	#	\"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
+	#	\"%(output)s\")'
 
 	# Automatically invoke the interactive merger in case of conflicts
 	#autoimerge = no