Commit | Line | Data |
---|---|---|
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 | |
14 | autoresolved: no | |
15 | ||
b4bddc06 | 16 | smtpserver: localhost:25 |
eb026d93 B |
17 | #smtpuser: username |
18 | #smtppassword: password | |
b4bddc06 | 19 | |
1e78b006 CM |
20 | # delay between messages in seconds (defaults to 2) |
21 | #smtpdelay: 2 | |
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 | |
1e075406 CM |
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 | |
32 | # output parameter | |
d7fade4b | 33 | merger: diff3 -L current -L ancestor -L patched -m -E \ |
41a6d859 CM |
34 | "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s" |
35 | ||
1e075406 CM |
36 | # Interactive three-way merge tool. It is executed by the 'resolved |
37 | # --interactive' command | |
38 | #imerger: xxdiff --title1 current --title2 ancestor --title3 patched \ | |
41a6d859 CM |
39 | # --show-merged-pane -m -E -O -X -M "%(output)s" \ |
40 | # "%(branch1)s" "%(ancestor)s" "%(branch2)s" | |
1e075406 | 41 | #imerger: emacs --eval '(ediff-merge-files-with-ancestor |
41a6d859 CM |
42 | # "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")' |
43 | ||
44 | # Leave the original files in the working tree in case of a merge conflict | |
45 | keeporig: yes | |
d7fade4b CM |
46 | |
47 | # Extensions for the files involved in a three-way merge (ancestor, | |
48 | # current, patched) | |
49 | #extensions: .ancestor .current .patched |