# 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)
# '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)
#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:
# 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\"
-
# Interactive two/three-way merge tool. It is executed by the
# 'resolved --interactive' command
#i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
# 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