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

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