mdw@git.distorted.org.uk Git - stgit/blob - examples/stgitrc

   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 # 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
  16 smtpserver: localhost:25
  17 #smtpuser: username
  18 #smtppassword: password
  19
  20 # delay between messages in seconds (defaults to 2)
  21 #smtpdelay: 2
  22
  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
  27 # Different three-way merge tools below. Uncomment the preferred one.
  28 # Note that the 'output' file contains the same data as 'branch1'. This
  29 # is useful for tools that do not take an output parameter
  30 merger: diff3 -L local -L older -L remote -m -E \
  31         "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
  32
  33 #merger: xxdiff --title1 local --title2 older --title3 remote \
  34 #       --show-merged-pane -m -E -O -X -M "%(output)s" \
  35 #       "%(branch1)s" "%(ancestor)s" "%(branch2)s"
  36
  37 #merger: emacs --eval '(ediff-merge-files-with-ancestor
  38 #       "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
  39
  40 # Leave the original files in the working tree in case of a merge conflict
  41 keeporig: yes