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

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