]>
Commit | Line | Data |
---|---|---|
5b61754d MF |
1 | [user] |
2 | name = Mike Frysinger | |
3 | email = vapier@gentoo.org | |
7e8353eb | 4 | # signingkey = 0xE837F581 |
454198a8 | 5 | |
83f5645b MF |
6 | [advice] |
7 | detachedHead = false | |
6f92aeeb | 8 | skippedCherryPicks = false |
83f5645b | 9 | |
81027099 MF |
10 | [core] |
11 | abbrev = 12 | |
454198a8 MF |
12 | pager = less -FRMX --tabs 4 -#10 |
13 | ||
5b61754d | 14 | [color] |
1afdf944 | 15 | ui = auto |
5b61754d MF |
16 | diff = auto |
17 | status = auto | |
454198a8 | 18 | |
5b61754d MF |
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 | |
454198a8 | 26 | |
f473de80 MF |
27 | [diff] |
28 | renames = true | |
454198a8 | 29 | |
83f5645b MF |
30 | [fetch] |
31 | parallel = 4 | |
32 | ||
e95eddde MF |
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 | ||
28429591 MF |
38 | [pager] |
39 | diff = diff-highlight | less | |
40 | log = diff-highlight | less | |
41 | show = diff-highlight | less | |
454198a8 | 42 | |
4db942a3 MF |
43 | [protocol] |
44 | # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html | |
45 | version = 2 | |
46 | ||
64d0ce9b MF |
47 | [pull] |
48 | ff = only | |
49 | ||
a2c26b73 MF |
50 | [push] |
51 | default = current | |
454198a8 | 52 | |
ca0cd585 MF |
53 | [alias] |
54 | a = add | |
4ca6dd0f MF |
55 | am-a = am --abort |
56 | am-c = am --continue | |
b383b052 | 57 | ar = archive |
2eb9fcf8 | 58 | b = branch -v |
2f8ca74b | 59 | bi = bisect |
a0b06b4f | 60 | cfg = config |
07ed0359 | 61 | ci = commit |
ee7dfe0a MF |
62 | cia = commit -a |
63 | ciaf = commit -a --fixup | |
64d0ce9b | 64 | ciam = commit --amend |
ee7dfe0a MF |
65 | ciaam = commit --amend -a |
66 | cif = commit --fixup | |
ca0cd585 | 67 | co = checkout |
c725b573 | 68 | cp = cherry-pick --ff |
95f2f47b MF |
69 | cp-a = cherry-pick --abort |
70 | cp-c = cherry-pick --continue | |
7fc979ec | 71 | cp-x = cherry-pick -x |
ca0cd585 | 72 | d = diff |
5c21fd25 | 73 | dc = diff --cached |
631efde8 | 74 | desc = describe |
ca0cd585 | 75 | f = fetch |
70f4d7c0 | 76 | fp = format-patch -C -M |
29204785 | 77 | g = grep |
9383ff84 | 78 | h = help |
ca0cd585 | 79 | l = log |
5d0b4331 | 80 | lf = log --format= --name-only |
3c975ae0 | 81 | lp = log -p |
a78ac121 | 82 | m = merge --log=100 --no-stat |
9c1e8a82 MF |
83 | rb = rebase |
84 | rb-d = rebase --committer-date-is-author-date | |
ca0cd585 MF |
85 | rb-a = rebase --abort |
86 | rb-c = rebase --continue | |
87 | rb-i = rebase --interactive | |
88 | rb-s = rebase --skip | |
89 | rl = rev-list | |
184f604a | 90 | se = send-email -C -M |
ef3aa4f9 | 91 | sm = submodule |
3c975ae0 | 92 | st = status -s |
8a3f4e0c | 93 | t = tag |
83f5645b | 94 | vl = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset' |
454198a8 | 95 | |
f473de80 MF |
96 | [tag] |
97 | sort = version:refname | |
454198a8 | 98 | |
52887a61 MF |
99 | [merge] |
100 | conflictstyle = diff3 | |
454198a8 | 101 | |
5b7ba27c MF |
102 | [rebase] |
103 | autosquash = true | |
454198a8 | 104 | |
d42b596a MF |
105 | [http] |
106 | cookiefile = ~/.gitcookies | |
454198a8 | 107 | |
a65aefe8 MF |
108 | [submodule] |
109 | fetchJobs = 4 | |
110 | ||
26d53874 MF |
111 | [transfer] |
112 | # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0 | |
113 | fsckobjects = true | |
454198a8 | 114 | |
28429591 MF |
115 | [init] |
116 | defaultBranch = main | |
117 | ||
db0968c6 MF |
118 | [merge "merge-changelog"] |
119 | name = GNU-style ChangeLog merge driver | |
120 | driver = /usr/bin/git-merge-changelog %O %A %B | |
454198a8 | 121 | |
5b61754d | 122 | [sendemail] |
79936f7d | 123 | chainreplyto = false |
d4284c9f | 124 | confirm = always |
5b61754d | 125 | suppressfrom = true |
f473de80 | 126 | suppresscc = author |
28429591 MF |
127 | transferEncoding = 8bit |
128 | # composeencoding = utf-8 | |
129 | assume8bitEncoding = 8bit | |
e3276bf1 MF |
130 | |
131 | sendmailcmd = ssh dev /usr/sbin/sendmail | |
132 | # smtpEncryption = tls | |
133 | # smtpServer = smtp.gentoo.org | |
134 | # smtpUser = vapier | |
135 | # smtpPass = |