1 # StGIT configuration file. Copy it to any of ~/.gitconfig or
2 # .git/config and modify as needed. Note that the latter overrides
3 # the former. The "git config" command can be used as well
6 # Default author/committer details (standard GIT variables)
8 email = your.name@yourcompany.com
11 # E-mail sender (added to the "From: " header)
12 #sender = Your Name <your.name@yourcompany.com>
14 # Automatically Bcc the address below
15 #autobcc = your.name@yourcompany.com
17 # Set to 'yes' if you don't want to use the 'resolved' command.
18 # 'refresh' will automatically mark the conflicts as resolved
21 # SMTP server for sending patches
22 #smtpserver = /usr/sbin/sendmail -t -i
23 #smtpserver = localhost:25
25 # Set to 'yes' to use SMTP over TLS
28 # Username for SMTP authentication, required if TLS is used
31 # Password for SMTP. If not provided, it will be asked
32 #smtppassword = password
34 # delay between messages in seconds (defaults to 5)
37 # stg will look for this first, then look for the EDITOR environmental
38 # variable, then default to using 'vi'
41 # this value overrides the default PAGER environment variable
42 #pager = ~/share/stgit/contrib/diffcol.sh
43 #pager = filterdiff --annotate | colordiff | less -FRX
45 # GIT pull and fetch commands (should take the same arguments as
46 # git-fetch or git-pull). By default:
50 # Rebase command. Note that this command is internally implemented in
51 # a different way. Only define this option if a different rebase
52 # is needed (i.e. 'git svn rebase')
53 #rebasecmd = git-reset
55 # "stg pull" policy. This is the repository default, which can be
56 # overriden on a per-branch basis using branch.*.stgit.pull-policy
59 # To support remote rewinding parent branches:
60 #pull-policy = fetch-rebase
61 # To support local parent branches:
64 # Interactive two/three-way merge tool. It is executed by the
65 # 'resolved --interactive' command
66 #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
67 # --show-merged-pane -m -E -O -X -M \"%(output)s\" \
68 # \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"
69 #i2merge = xxdiff --title1 current --title2 patched \
70 # --show-merged-pane -m -E -O -X -M \"%(output)s\" \
71 # \"%(branch1)s\" \"%(branch2)s\"
72 #i3merge = emacs --eval '(ediff-merge-files-with-ancestor \
73 # \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
75 #i2merge = emacs --eval '(ediff-merge-files \
76 # \"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")'
78 # Automatically invoke the interactive merger in case of conflicts
81 # Leave the original files in the working tree in case of a
85 # Optimize (repack) the object store after every pull
88 # Extensions for the files involved in a three-way merge (ancestor,
90 #extensions = .ancestor .current .patched
92 # The number of patches to be listed before and after the
93 # current one by the 'series --short' command
96 # The maximum length of an automatically generated patch name
99 # Extra options to pass to "git diff" (extend/override with
100 # -O/--diff-opts). For example, -M turns on rename detection.
104 # E-mail aliases used with the 'mail' command
105 git = git@vger.kernel.org