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

diff --git a/examples/gitconfig b/examples/gitconfig
index 52d2a69..9efc089 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -14,11 +14,15 @@
 	# Automatically Bcc the address below
 	#autobcc = your.name@yourcompany.com
 
+	# 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
 
 	# Set to 'yes' to use SMTP over TLS
@@ -42,14 +46,14 @@
 	#pager = filterdiff --annotate | colordiff | less -FRX
 
 	# GIT pull and fetch commands (should take the same arguments as
-	# git-fetch or git-pull).  By default:
-	#pullcmd = git-pull
-	#fetchcmd = git-fetch
+	# git fetch or git pull).  By default:
+	#pullcmd = git pull
+	#fetchcmd = git fetch
 
 	# Rebase command. Note that this command is internally implemented in
 	# a different way. Only define this option if a different rebase
 	# is needed (i.e. 'git svn rebase')
-	#rebasecmd = git-reset
+	#rebasecmd = git reset
 
 	# "stg pull" policy.  This is the repository default, which can be
 	# overriden on a per-branch basis using branch.*.stgit.pull-policy
@@ -60,13 +64,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 +99,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