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

   1 [stgit]
   2 # Default author/committer details
   3 #authname:  Your Name
   4 #authemail: your.name@yourcompany.com
   5 #commname:  Your Name
   6 #commemail: your.name@yourcompany.com
   7
   8 # Set to 'yes' if you don't want to use the 'resolved' command.
   9 # 'refresh' will automatically mark the conflicts as resolved
  10 autoresolved: no
  11
  12
  13 [gitmergeonefile]
  14 # Different three-way merge tools below. Uncomment the preferred one.
  15 # Note that the 'output' file contains the same data as 'branch1'. This
  16 # is useful for tools that do not take an output parameter
  17
  18 merger: diff3 -L local -L older -L remote -m -E \
  19         "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
  20
  21 #merger: xxdiff --title1 local --title2 older --title3 remote \
  22 #       --show-merged-pane -m -E -O -X -M "%(output)s" \
  23 #       "%(branch1)s" "%(ancestor)s" "%(branch2)s"
  24
  25 #merger: emacs --eval '(ediff-merge-files-with-ancestor
  26 #       "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
  27
  28 # Leave the original files in the working tree in case of a merge conflict
  29 keeporig: yes