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 | |
41a6d859 CM |
20 | |
21 | [gitmergeonefile] | |
22 | # Different three-way merge tools below. Uncomment the preferred one. | |
23 | # Note that the 'output' file contains the same data as 'branch1'. This | |
24 | # is useful for tools that do not take an output parameter | |
25 | ||
26 | merger: diff3 -L local -L older -L remote -m -E \ | |
27 | "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s" | |
28 | ||
29 | #merger: xxdiff --title1 local --title2 older --title3 remote \ | |
30 | # --show-merged-pane -m -E -O -X -M "%(output)s" \ | |
31 | # "%(branch1)s" "%(ancestor)s" "%(branch2)s" | |
32 | ||
33 | #merger: emacs --eval '(ediff-merge-files-with-ancestor | |
34 | # "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")' | |
35 | ||
36 | # Leave the original files in the working tree in case of a merge conflict | |
37 | keeporig: yes |