Add a 'sender' configuration option
[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
901288c2
CM
12# E-mail sender (added to the "From: " header)
13#sender: Your Name <your.name@yourcompany.com>
14
d884c4d8
CM
15# Automatically Bcc the address below
16#autobcc: your.name@yourcompany.com
17
41a6d859
CM
18# Set to 'yes' if you don't want to use the 'resolved' command.
19# 'refresh' will automatically mark the conflicts as resolved
b3bfa120 20#autoresolved: no
41a6d859 21
b3bfa120 22#smtpserver: localhost:25
eb026d93
B
23#smtpuser: username
24#smtppassword: password
b4bddc06 25
b3bfa120
CM
26# delay between messages in seconds (defaults to 5)
27#smtpdelay: 5
1e78b006 28
cd076ff6
CL
29# stg will look for this first, then look for the EDITOR environmental
30# variable, then default to using 'vi'
31#editor: /usr/bin/vi
32
52f3900c 33# this value overrides the default PAGER environment variable
0eec33bc 34#pager: ~/share/stgit/contrib/diffcol.sh
52f3900c 35
b3bfa120
CM
36# GIT pull command (should take the same arguments as git-pull)
37#pullcmd: git-pull
38
1e075406
CM
39# The three-way merge tool. Note that the 'output' file contains the
40# same data as 'branch1'. This is useful for tools that do not take an
41# output parameter
b3bfa120
CM
42#merger: diff3 -L current -L ancestor -L patched -m -E \
43# "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
41a6d859 44
1e075406
CM
45# Interactive three-way merge tool. It is executed by the 'resolved
46# --interactive' command
47#imerger: xxdiff --title1 current --title2 ancestor --title3 patched \
41a6d859
CM
48# --show-merged-pane -m -E -O -X -M "%(output)s" \
49# "%(branch1)s" "%(ancestor)s" "%(branch2)s"
1e075406 50#imerger: emacs --eval '(ediff-merge-files-with-ancestor
41a6d859
CM
51# "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
52
53# Leave the original files in the working tree in case of a merge conflict
b3bfa120 54#keeporig: yes
d7fade4b 55
925ff4a7
CL
56# Optimize (repack) the object store after every pull
57#keepoptimized: yes
58
d7fade4b
CM
59# Extensions for the files involved in a three-way merge (ancestor,
60# current, patched)
61#extensions: .ancestor .current .patched