chiark / gitweb /
Add a "make tags" target
[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 5[user]
26f4a431
CM
6 # Default author/committer details (standard GIT variables)
7 name = Your Name
8 email = your.name@yourcompany.com
41a6d859 9
9e3f506f 10[stgit]
26f4a431
CM
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
3b3c26fa 36 # GIT pull and fetch commands (should take the same arguments as
4cd6405e 37 # git-fetch or git-pull). By default:
26f4a431 38 #pullcmd = git-pull
3b3c26fa
YD
39 #fetchcmd = git-fetch
40
41 # "stg pull" policy. This is the repository default, which can be
42 # overriden on a per-branch basis using branch.*.stgit.pull-policy
43 # By default:
44 #pull-policy = pull
45 # To support remote rewinding parent branches:
46 #pull-policy = fetch-rebase
47 # To support local parent branches:
48 #pull-policy = rebase
26f4a431
CM
49
50 # The three-way merge tool. Note that the 'output' file contains the
51 # same data as 'branch1'. This is useful for tools that do not take an
52 # output parameter
53 #merger = diff3 -L current -L ancestor -L patched -m -E \
e0bbefdd
CM
54 # \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
55 # > \"%(output)s\"
26f4a431 56
b6e961f2
CM
57 # Interactive two/three-way merge tool. It is executed by the
58 # 'resolved --interactive' command
59 #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
e0bbefdd
CM
60 # --show-merged-pane -m -E -O -X -M \"%(output)s\" \
61 # \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"
b6e961f2
CM
62 #i2merge = xxdiff --title1 current --title2 patched \
63 # --show-merged-pane -m -E -O -X -M \"%(output)s\" \
64 # \"%(branch1)s\" \"%(branch2)s\"
65 #i3merge = emacs --eval '(ediff-merge-files-with-ancestor \
e0bbefdd
CM
66 # \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
67 # \"%(output)s\")'
b6e961f2
CM
68 #i2merge = emacs --eval '(ediff-merge-files \
69 # \"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")'
26f4a431 70
f7ed76a9
CM
71 # Automatically invoke the interactive merger in case of conflicts
72 #autoimerge = no
73
26f4a431
CM
74 # Leave the original files in the working tree in case of a
75 # merge conflict
76 #keeporig = yes
77
78 # Optimize (repack) the object store after every pull
79 #keepoptimized = yes
80
81 # Extensions for the files involved in a three-way merge (ancestor,
82 # current, patched)
83 #extensions = .ancestor .current .patched
79df2f0d 84
c6f366f6
CM
85 # The number of patches to be listed before and after the
86 # current one by the 'series --short' command
87 #shortnr = 5
88
79df2f0d
CM
89[mail "alias"]
90 # E-mail aliases used with the 'mail' command
91 git = git@vger.kernel.org