Discard stderr output from git-rev-parse

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 3abbe6a7f960be979089f83f47c0ff1229afbcc2..52d2a696d5d0c004fa13c7327136f75f44655650 100644 (file)
--- 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
 # 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)
 
 [user]
        # Default author/committer details (standard GIT variables)


@@ -18,10 +18,17 @@
        # 'refresh' will automatically mark the conflicts as resolved
        #autoresolved = no
 
        # 'refresh' will automatically mark the conflicts as resolved
        #autoresolved = no
 

+       # SMTP server for sending patches

        #smtpserver = localhost:25
        #smtpserver = localhost:25

+
+       # Set to 'yes' to use SMTP over TLS
+       #smtptls = no
+
+       # Username for SMTP authentication, required if TLS is used

        #smtpuser = username
        #smtpuser = username

+
+       # Password for SMTP.  If not provided, it will be asked

        #smtppassword = password
        #smtppassword = password

-       #smtptls = no

 
        # delay between messages in seconds (defaults to 5)
        #smtpdelay = 5
 
        # delay between messages in seconds (defaults to 5)
        #smtpdelay = 5


@@ -39,6 +46,11 @@
        #pullcmd = git-pull
        #fetchcmd = git-fetch
 
        #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:
        # "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
 
        # 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
 [mail "alias"]
        # E-mail aliases used with the 'mail' command
        git = git@vger.kernel.org