]>
Commit | Line | Data |
---|---|---|
1 | [user] | |
2 | name = Mike Frysinger | |
3 | email = vapier@gentoo.org | |
4 | # signingkey = 0xE837F581 | |
5 | ||
6 | [advice] | |
7 | detachedHead = false | |
8 | skippedCherryPicks = false | |
9 | ||
10 | [core] | |
11 | abbrev = 12 | |
12 | pager = less -FRMX --tabs 4 -#10 | |
13 | ||
14 | [color] | |
15 | ui = auto | |
16 | diff = auto | |
17 | status = auto | |
18 | ||
19 | [color "diff"] | |
20 | old = red bold | |
21 | new = green bold | |
22 | plain = blue bold | |
23 | frag = yellow bold | |
24 | whitespace = normal green | |
25 | meta = magenta | |
26 | ||
27 | [diff] | |
28 | renames = true | |
29 | ||
30 | [fetch] | |
31 | parallel = 4 | |
32 | ||
33 | # Settings used by Chromium's `git cl`. The defaults are brain-dead. | |
34 | [gerrit] | |
35 | skip-ensure-authenticated = true | |
36 | squash-uploads = false | |
37 | ||
38 | [pager] | |
39 | diff = diff-highlight | less | |
40 | log = diff-highlight | less | |
41 | show = diff-highlight | less | |
42 | ||
43 | [protocol] | |
44 | # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html | |
45 | version = 2 | |
46 | ||
47 | [pull] | |
48 | ff = only | |
49 | ||
50 | [push] | |
51 | default = current | |
52 | ||
53 | [alias] | |
54 | a = add | |
55 | am-a = am --abort | |
56 | am-c = am --continue | |
57 | ar = archive | |
58 | b = branch -v | |
59 | bi = bisect | |
60 | cfg = config | |
61 | ci = commit | |
62 | cia = commit -a | |
63 | ciaf = commit -a --fixup | |
64 | ciam = commit --amend | |
65 | ciaam = commit --amend -a | |
66 | cif = commit --fixup | |
67 | co = checkout | |
68 | cp = cherry-pick --ff | |
69 | cp-a = cherry-pick --abort | |
70 | cp-c = cherry-pick --continue | |
71 | cp-x = cherry-pick -x | |
72 | d = diff | |
73 | dc = diff --cached | |
74 | desc = describe | |
75 | f = fetch | |
76 | fp = format-patch -C -M | |
77 | g = grep | |
78 | h = help | |
79 | l = log | |
80 | lf = log --format= --name-only | |
81 | lp = log -p | |
82 | m = merge --log=100 --no-stat | |
83 | rb = rebase | |
84 | rb-d = rebase --committer-date-is-author-date | |
85 | rb-a = rebase --abort | |
86 | rb-c = rebase --continue | |
87 | rb-i = rebase --interactive | |
88 | rb-s = rebase --skip | |
89 | rl = rev-list | |
90 | se = send-email -C -M | |
91 | sm = submodule | |
92 | st = status -s | |
93 | t = tag | |
94 | vl = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset' | |
95 | ||
96 | [tag] | |
97 | sort = version:refname | |
98 | ||
99 | [merge] | |
100 | conflictstyle = diff3 | |
101 | ||
102 | [rebase] | |
103 | autosquash = true | |
104 | ||
105 | [http] | |
106 | cookiefile = ~/.gitcookies | |
107 | ||
108 | [transfer] | |
109 | # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0 | |
110 | fsckobjects = true | |
111 | ||
112 | [init] | |
113 | defaultBranch = main | |
114 | ||
115 | [merge "merge-changelog"] | |
116 | name = GNU-style ChangeLog merge driver | |
117 | driver = /usr/bin/git-merge-changelog %O %A %B | |
118 | ||
119 | [sendemail] | |
120 | chainreplyto = false | |
121 | confirm = always | |
122 | suppressfrom = true | |
123 | suppresscc = author | |
124 | transferEncoding = 8bit | |
125 | # composeencoding = utf-8 | |
126 | assume8bitEncoding = 8bit | |
127 | ||
128 | sendmailcmd = ssh dev /usr/sbin/sendmail | |
129 | # smtpEncryption = tls | |
130 | # smtpServer = smtp.gentoo.org | |
131 | # smtpUser = vapier | |
132 | # smtpPass = |