X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/fc44c2cadaf20ba3deb2d5e6bb536f153fea2cea..b85a27bc852a94855fc410a0921fcaef2d13506b:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 3abbe6a..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,10 +18,17 @@
 	# '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
-	#smtptls = no
 
 	# delay between messages in seconds (defaults to 5)
 	#smtpdelay = 5
@@ -39,6 +46,11 @@
 	#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:
@@ -87,6 +99,9 @@
 	# 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