X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/26f4a431939dc3a605773dded9c7c6bc1420de80..1d5cfe617d97d943b41f4be17c4f5955a7026297:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index a2980c9..52d2a69 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -1,6 +1,6 @@
 # StGIT configuration file. Copy it to any of ~/.gitconfig or
 # .git/config and modify as needed. Note that the latter overrides
-# the former. The "git repo-config" command can be used as well
+# the former. The "git config" command can be used as well
 
 [user]
 	# Default author/committer details (standard GIT variables)
@@ -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)
@@ -33,22 +41,48 @@
 	#pager = ~/share/stgit/contrib/diffcol.sh
 	#pager = filterdiff --annotate | colordiff | less -FRX
 
-	# GIT pull command (should take the same arguments as git-pull)
+	# GIT pull and fetch commands (should take the same arguments as
+	# 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
+
+	# "stg pull" policy.  This is the repository default, which can be
+	# overriden on a per-branch basis using branch.*.stgit.pull-policy
+	# By default:
+	#pull-policy = pull
+	# To support remote rewinding parent branches:
+	#pull-policy = fetch-rebase
+	# 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"
+	#	\"%(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 \
-	#	--show-merged-pane -m -E -O -X -M "%(output)s" \
-	#	"%(branch1)s" "%(ancestor)s" "%(branch2)s"
-	#imerger = emacs --eval '(ediff-merge-files-with-ancestor \
-	#	"%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
+	# 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\"
+	#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
 
 	# Leave the original files in the working tree in case of a
 	# merge conflict
@@ -60,3 +94,14 @@
 	# Extensions for the files involved in a three-way merge (ancestor,
 	# current, patched)
 	#extensions = .ancestor .current .patched
+
+	# The number of patches to be listed before and after the
+	# current one by the 'series --short' command
+	#shortnr = 5
+
+	# The maximum length of an automatically generated patch name
+	#namelenth = 30
+
+[mail "alias"]
+	# E-mail aliases used with the 'mail' command
+	git = git@vger.kernel.org