Commit | Line | Data |
---|---|---|
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 | ||
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 | ||
6cf5ec9b | 21 | # SMTP server for sending patches |
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 | |
41 | #pager = ~/share/stgit/contrib/diffcol.sh | |
42 | #pager = filterdiff --annotate | colordiff | less -FRX | |
43 | ||
3b3c26fa | 44 | # GIT pull and fetch commands (should take the same arguments as |
4cd6405e | 45 | # git-fetch or git-pull). By default: |
26f4a431 | 46 | #pullcmd = git-pull |
3b3c26fa YD |
47 | #fetchcmd = git-fetch |
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') | |
52 | #rebasecmd = git-reset | |
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 | |
b6e961f2 CM |
63 | # Interactive two/three-way merge tool. It is executed by the |
64 | # 'resolved --interactive' command | |
65 | #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \ | |
e0bbefdd CM |
66 | # --show-merged-pane -m -E -O -X -M \"%(output)s\" \ |
67 | # \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" | |
b6e961f2 CM |
68 | #i2merge = xxdiff --title1 current --title2 patched \ |
69 | # --show-merged-pane -m -E -O -X -M \"%(output)s\" \ | |
70 | # \"%(branch1)s\" \"%(branch2)s\" | |
71 | #i3merge = emacs --eval '(ediff-merge-files-with-ancestor \ | |
e0bbefdd CM |
72 | # \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \ |
73 | # \"%(output)s\")' | |
b6e961f2 CM |
74 | #i2merge = emacs --eval '(ediff-merge-files \ |
75 | # \"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")' | |
26f4a431 | 76 | |
f7ed76a9 CM |
77 | # Automatically invoke the interactive merger in case of conflicts |
78 | #autoimerge = no | |
79 | ||
26f4a431 CM |
80 | # Leave the original files in the working tree in case of a |
81 | # merge conflict | |
82 | #keeporig = yes | |
83 | ||
84 | # Optimize (repack) the object store after every pull | |
85 | #keepoptimized = yes | |
86 | ||
87 | # Extensions for the files involved in a three-way merge (ancestor, | |
88 | # current, patched) | |
89 | #extensions = .ancestor .current .patched | |
79df2f0d | 90 | |
c6f366f6 CM |
91 | # The number of patches to be listed before and after the |
92 | # current one by the 'series --short' command | |
93 | #shortnr = 5 | |
94 | ||
1b814c72 CM |
95 | # The maximum length of an automatically generated patch name |
96 | #namelenth = 30 | |
97 | ||
dcbb2c6a KH |
98 | # Extra options to pass to "git diff" (extend/override with |
99 | # -O/--diff-opts). For example, -M turns on rename detection. | |
100 | #diff-opts = -M | |
101 | ||
79df2f0d CM |
102 | [mail "alias"] |
103 | # E-mail aliases used with the 'mail' command | |
104 | git = git@vger.kernel.org |