X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/b993d23f49af71ded6b0eaeb19ccf25b6bec4432..9ab06b9858bbb0196867506724a8d74c8f39e113:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index f6e3a79..4f56918 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -17,10 +17,6 @@
 	# Automatically sign newly created patches
 	#autosign = Signed-off-by
 
-	# Set to 'yes' if you don't want to use the 'resolved' command.
-	# 'refresh' will automatically mark the conflicts as resolved
-	#autoresolved = no
-
 	# SMTP server for sending patches
 	#smtpserver = /usr/sbin/sendmail -t -i
 	#smtpserver = localhost:25
@@ -42,8 +38,8 @@
 	#editor = /usr/bin/vi
 
 	# this value overrides the default PAGER environment variable
-	#pager = ~/share/stgit/contrib/diffcol.sh
-	#pager = filterdiff --annotate | colordiff | less -FRX
+	#pager = less -FRSX
+	#pager = filterdiff --annotate | colordiff | less -FRSX
 
 	# GIT pull and fetch commands (should take the same arguments as
 	# git fetch or git pull).  By default: