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