X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/b6c95ada87ed57ef78f4a02987606e498cd4e04d..7441f9614f4f4840c5473b54993312ace26bb897:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 4e775fc..c61f119 100644
--- 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