Add an optional prefix to the PATCH subject when mailing.
[stgit] / examples / stgitrc
CommitLineData
47e93ba9
CM
1# StGIT configuration file. Copy it to any of /etc/stgitrc, ~/.stgitrc
2# or .git/stgitrc and modify as needed. Note that the latter overrides
3# the former.
4
41a6d859
CM
5[stgit]
6# Default author/committer details
7#authname: Your Name
8#authemail: your.name@yourcompany.com
9#commname: Your Name
10#commemail: your.name@yourcompany.com
11
12# Set to 'yes' if you don't want to use the 'resolved' command.
13# 'refresh' will automatically mark the conflicts as resolved
b3bfa120 14#autoresolved: no
41a6d859 15
b3bfa120 16#smtpserver: localhost:25
eb026d93
B
17#smtpuser: username
18#smtppassword: password
b4bddc06 19
b3bfa120
CM
20# delay between messages in seconds (defaults to 5)
21#smtpdelay: 5
1e78b006 22
cd076ff6
CL
23# stg will look for this first, then look for the EDITOR environmental
24# variable, then default to using 'vi'
25#editor: /usr/bin/vi
26
52f3900c 27# this value overrides the default PAGER environment variable
0eec33bc 28#pager: ~/share/stgit/contrib/diffcol.sh
52f3900c 29
b3bfa120
CM
30# GIT pull command (should take the same arguments as git-pull)
31#pullcmd: git-pull
32
1e075406
CM
33# The three-way merge tool. Note that the 'output' file contains the
34# same data as 'branch1'. This is useful for tools that do not take an
35# output parameter
b3bfa120
CM
36#merger: diff3 -L current -L ancestor -L patched -m -E \
37# "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
41a6d859 38
1e075406
CM
39# Interactive three-way merge tool. It is executed by the 'resolved
40# --interactive' command
41#imerger: xxdiff --title1 current --title2 ancestor --title3 patched \
41a6d859
CM
42# --show-merged-pane -m -E -O -X -M "%(output)s" \
43# "%(branch1)s" "%(ancestor)s" "%(branch2)s"
1e075406 44#imerger: emacs --eval '(ediff-merge-files-with-ancestor
41a6d859
CM
45# "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
46
47# Leave the original files in the working tree in case of a merge conflict
b3bfa120 48#keeporig: yes
d7fade4b
CM
49
50# Extensions for the files involved in a three-way merge (ancestor,
51# current, patched)
52#extensions: .ancestor .current .patched