Merge branch 'stable'

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index c16f786..9efc089 100644 (file)
--- 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