X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/3b3c26fa79d6632363c141b68df4b024f367ad0b..6cf5ec9b2572ae59bfa59d1c23bc58cf4677ce0f:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 637f153..e402208 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -18,8 +18,16 @@
 	# 'refresh' will automatically mark the conflicts as resolved
 	#autoresolved = no
 
+	# SMTP server for sending patches
 	#smtpserver = localhost:25
+
+	# Set to 'yes' to use SMTP over TLS
+	#smtptls = no
+
+	# Username for SMTP authentication, required if TLS is used
 	#smtpuser = username
+
+	# Password for SMTP.  If not provided, it will be asked
 	#smtppassword = password
 
 	# delay between messages in seconds (defaults to 5)
@@ -54,14 +62,19 @@
 	#	\"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
 	#	> \"%(output)s\"
 
-	# Interactive three-way merge tool. It is executed by the 'resolved
-	# --interactive' command
-	#imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
+	# Interactive two/three-way merge tool. It is executed by the
+	# 'resolved --interactive' command
+	#i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
 	#	--show-merged-pane -m -E -O -X -M \"%(output)s\" \
 	#	\"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"
-	#imerger = emacs --eval '(ediff-merge-files-with-ancestor \
+	#i2merge = xxdiff --title1 current --title2 patched \
+	#	--show-merged-pane -m -E -O -X -M \"%(output)s\" \
+	#	\"%(branch1)s\" \"%(branch2)s\"
+	#i3merge = emacs --eval '(ediff-merge-files-with-ancestor \
 	#	\"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
 	#	\"%(output)s\")'
+	#i2merge = emacs --eval '(ediff-merge-files \
+	#	\"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")'
 
 	# Automatically invoke the interactive merger in case of conflicts
 	#autoimerge = no