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