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