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
6 # Default author/committer details
8 #authemail: your.name@yourcompany.com
10 #commemail: your.name@yourcompany.com
12 # Set to 'yes' if you don't want to use the 'resolved' command.
13 # 'refresh' will automatically mark the conflicts as resolved
16 smtpserver: localhost:25
18 #smtppassword: password
20 # delay between messages in seconds (defaults to 2)
23 # stg will look for this first, then look for the EDITOR environmental
24 # variable, then default to using 'vi'
27 # this value overrides the default PAGER environment variable
28 #pager: ~/share/stgit/contrib/diffcol.sh
30 # The three-way merge tool. Note that the 'output' file contains the
31 # same data as 'branch1'. This is useful for tools that do not take an
33 merger: diff3 -L current -L ancestor -L patched -m -E \
34 "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
36 # Interactive three-way merge tool. It is executed by the 'resolved
37 # --interactive' command
38 #imerger: xxdiff --title1 current --title2 ancestor --title3 patched \
39 # --show-merged-pane -m -E -O -X -M "%(output)s" \
40 # "%(branch1)s" "%(ancestor)s" "%(branch2)s"
41 #imerger: emacs --eval '(ediff-merge-files-with-ancestor
42 # "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
44 # Leave the original files in the working tree in case of a merge conflict
47 # Extensions for the files involved in a three-way merge (ancestor,
49 #extensions: .ancestor .current .patched