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 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         # SMTP server for sending patches
  22         #smtpserver = /usr/sbin/sendmail -t -i
  23         #smtpserver = localhost:25
  24
  25         # Set to 'yes' to use SMTP over TLS
  26         #smtptls = no
  27
  28         # Username for SMTP authentication, required if TLS is used
  29         #smtpuser = username
  30
  31         # Password for SMTP.  If not provided, it will be asked
  32         #smtppassword = password
  33
  34         # delay between messages in seconds (defaults to 5)
  35         #smtpdelay = 5
  36
  37         # stg will look for this first, then look for the EDITOR environmental
  38         # variable, then default to using 'vi'
  39         #editor = /usr/bin/vi
  40
  41         # this value overrides the default PAGER environment variable
  42         #pager = ~/share/stgit/contrib/diffcol.sh
  43         #pager = filterdiff --annotate | colordiff | less -FRX
  44
  45         # GIT pull and fetch commands (should take the same arguments as
  46         # git fetch or git pull).  By default:
  47         #pullcmd = git pull
  48         #fetchcmd = git fetch
  49
  50         # Rebase command. Note that this command is internally implemented in
  51         # a different way. Only define this option if a different rebase
  52         # is needed (i.e. 'git svn rebase')
  53         #rebasecmd = git reset
  54
  55         # "stg pull" policy.  This is the repository default, which can be
  56         # overriden on a per-branch basis using branch.*.stgit.pull-policy
  57         # By default:
  58         #pull-policy = pull
  59         # To support remote rewinding parent branches:
  60         #pull-policy = fetch-rebase
  61         # To support local parent branches:
  62         #pull-policy = rebase
  63
  64         # Interactive two/three-way merge tool. It is executed by the
  65         # 'resolved --interactive' command
  66         #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
  67         #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
  68         #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"
  69         #i2merge = xxdiff --title1 current --title2 patched \
  70         #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
  71         #       \"%(branch1)s\" \"%(branch2)s\"
  72         #i3merge = emacs --eval '(ediff-merge-files-with-ancestor \
  73         #       \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
  74         #       \"%(output)s\")'
  75         #i2merge = emacs --eval '(ediff-merge-files \
  76         #       \"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")'
  77
  78         # Automatically invoke the interactive merger in case of conflicts
  79         #autoimerge = no
  80
  81         # Leave the original files in the working tree in case of a
  82         # merge conflict
  83         #keeporig = yes
  84
  85         # Optimize (repack) the object store after every pull
  86         #keepoptimized = yes
  87
  88         # Extensions for the files involved in a three-way merge (ancestor,
  89         # current, patched)
  90         #extensions = .ancestor .current .patched
  91
  92         # The number of patches to be listed before and after the
  93         # current one by the 'series --short' command
  94         #shortnr = 5
  95
  96         # The maximum length of an automatically generated patch name
  97         #namelenth = 30
  98
  99         # Extra options to pass to "git diff" (extend/override with
 100         # -O/--diff-opts). For example, -M turns on rename detection.
 101         #diff-opts = -M
 102
 103 [mail "alias"]
 104         # E-mail aliases used with the 'mail' command
 105         git = git@vger.kernel.org