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