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
  37         # git-fetch or git-pull).  By default:
  38         #pullcmd = git-fetch
  39         #pull-does-rebase = yes
  40         # Alternative (old behaviour), less intuitive but maybe useful
  41         # for some workflows:
  42         #pullcmd = git-pull
  43         #pull-does-rebase = no
  44
  45         # The three-way merge tool. Note that the 'output' file contains the
  46         # same data as 'branch1'. This is useful for tools that do not take an
  47         # output parameter
  48         #merger = diff3 -L current -L ancestor -L patched -m -E \
  49         #       "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
  50
  51         # Interactive three-way merge tool. It is executed by the 'resolved
  52         # --interactive' command
  53         #imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
  54         #       --show-merged-pane -m -E -O -X -M "%(output)s" \
  55         #       "%(branch1)s" "%(ancestor)s" "%(branch2)s"
  56         #imerger = emacs --eval '(ediff-merge-files-with-ancestor \
  57         #       "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
  58
  59         # Automatically invoke the interactive merger in case of conflicts
  60         #autoimerge = no
  61
  62         # Leave the original files in the working tree in case of a
  63         # merge conflict
  64         #keeporig = yes
  65
  66         # Optimize (repack) the object store after every pull
  67         #keepoptimized = yes
  68
  69         # Extensions for the files involved in a three-way merge (ancestor,
  70         # current, patched)
  71         #extensions = .ancestor .current .patched
  72
  73         # The number of patches to be listed before and after the
  74         # current one by the 'series --short' command
  75         #shortnr = 5
  76
  77 [mail "alias"]
  78         # E-mail aliases used with the 'mail' command
  79         git = git@vger.kernel.org