]>
Commit | Line | Data |
---|---|---|
1 | [user] | |
2 | name = Mike Frysinger | |
3 | email = vapier@gentoo.org | |
4 | # signingkey = 0xE837F581 | |
5 | ||
6 | [core] | |
7 | abbrev = 12 | |
8 | pager = less -FRMX --tabs 4 -#10 | |
9 | ||
10 | [color] | |
11 | ui = auto | |
12 | diff = auto | |
13 | status = auto | |
14 | ||
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 | |
22 | ||
23 | [diff] | |
24 | renames = true | |
25 | ||
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 | ||
31 | #[pager] | |
32 | # diff = diff-highlight | less | |
33 | # log = diff-highlight | less | |
34 | # show = diff-highlight | less | |
35 | ||
36 | [protocol] | |
37 | # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html | |
38 | version = 2 | |
39 | ||
40 | [push] | |
41 | default = current | |
42 | ||
43 | [alias] | |
44 | a = add | |
45 | am-a = am --abort | |
46 | am-c = am --continue | |
47 | ar = archive | |
48 | b = branch -v | |
49 | bi = bisect | |
50 | cfg = config | |
51 | ci = commit | |
52 | co = checkout | |
53 | cp = cherry-pick --ff | |
54 | cp-a = cherry-pick --abort | |
55 | cp-c = cherry-pick --continue | |
56 | cp-x = cherry-pick -x | |
57 | d = diff | |
58 | desc = describe | |
59 | f = fetch | |
60 | fp = format-patch -C -M | |
61 | g = grep | |
62 | h = help | |
63 | l = log | |
64 | lf = log --format= --name-only | |
65 | m = merge --log=50 --no-stat | |
66 | rb = rebase | |
67 | rb-d = rebase --committer-date-is-author-date | |
68 | rb-a = rebase --abort | |
69 | rb-c = rebase --continue | |
70 | rb-i = rebase --interactive | |
71 | rb-s = rebase --skip | |
72 | rl = rev-list | |
73 | se = send-email -C -M | |
74 | sm = submodule | |
75 | st = status | |
76 | t = tag | |
77 | ||
78 | [tag] | |
79 | sort = version:refname | |
80 | ||
81 | [merge] | |
82 | conflictstyle = diff3 | |
83 | ||
84 | [rebase] | |
85 | autosquash = true | |
86 | ||
87 | [http] | |
88 | cookiefile = ~/.gitcookies | |
89 | ||
90 | [transfer] | |
91 | # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0 | |
92 | fsckobjects = true | |
93 | ||
94 | [merge "merge-changelog"] | |
95 | name = GNU-style ChangeLog merge driver | |
96 | driver = /usr/bin/git-merge-changelog %O %A %B | |
97 | ||
98 | [sendemail] | |
99 | chainreplyto = false | |
100 | confirm = always | |
101 | suppressfrom = true | |
102 | suppresscc = author | |
103 | smtpserver = localhost:1111 |