X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/04b442170d797b1cb80700838c41b7222040236c..ff3db0e4da2b61c858766adf5237c2877ffd411b:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index b7a6629..4a36202 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -19,6 +19,7 @@
 	#autoresolved = no
 
 	# SMTP server for sending patches
+	#smtpserver = /usr/sbin/sendmail -t -i
 	#smtpserver = localhost:25
 
 	# Set to 'yes' to use SMTP over TLS
@@ -60,13 +61,6 @@
 	# To support local parent branches:
 	#pull-policy = rebase
 
-	# 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\"
-
 	# Interactive two/three-way merge tool. It is executed by the
 	# 'resolved --interactive' command
 	#i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
@@ -102,6 +96,10 @@
 	# The maximum length of an automatically generated patch name
 	#namelenth = 30
 
+	# Extra options to pass to "git diff" (extend/override with
+	# -O/--diff-opts). For example, -M turns on rename detection.
+	#diff-opts = -M
+
 [mail "alias"]
 	# E-mail aliases used with the 'mail' command
 	git = git@vger.kernel.org