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