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