X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1d5cfe617d97d943b41f4be17c4f5955a7026297..7a6a45b5f1379466bd23b33a7feed47d0b8331b7:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 52d2a69..c16f786 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -60,13 +60,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 +95,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