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