]>
Commit | Line | Data |
---|---|---|
5b61754d MF |
1 | [user] |
2 | name = Mike Frysinger | |
3 | email = vapier@gentoo.org | |
7e8353eb | 4 | # signingkey = 0xE837F581 |
81027099 MF |
5 | [core] |
6 | abbrev = 12 | |
5b61754d | 7 | [color] |
1afdf944 | 8 | ui = auto |
5b61754d MF |
9 | diff = auto |
10 | status = auto | |
11 | [color "diff"] | |
12 | old = red bold | |
13 | new = green bold | |
14 | plain = blue bold | |
15 | frag = yellow bold | |
16 | whitespace = normal green | |
17 | meta = magenta | |
f473de80 MF |
18 | [diff] |
19 | renames = true | |
a2c26b73 MF |
20 | [push] |
21 | default = current | |
ca0cd585 MF |
22 | [alias] |
23 | a = add | |
35c220c5 | 24 | ab = abandon |
4ca6dd0f MF |
25 | am-a = am --abort |
26 | am-c = am --continue | |
b383b052 | 27 | ar = archive |
2eb9fcf8 | 28 | b = branch -v |
2f8ca74b | 29 | bi = bisect |
a0b06b4f | 30 | cfg = config |
07ed0359 | 31 | ci = commit |
ca0cd585 | 32 | co = checkout |
c725b573 | 33 | cp = cherry-pick --ff |
95f2f47b MF |
34 | cp-a = cherry-pick --abort |
35 | cp-c = cherry-pick --continue | |
7fc979ec | 36 | cp-x = cherry-pick -x |
ca0cd585 | 37 | d = diff |
631efde8 | 38 | desc = describe |
97c58010 | 39 | dl = download |
ca0cd585 | 40 | f = fetch |
70f4d7c0 | 41 | fp = format-patch -C -M |
29204785 | 42 | g = grep |
9383ff84 | 43 | h = help |
ca0cd585 MF |
44 | l = log |
45 | m = merge | |
9c1e8a82 MF |
46 | rb = rebase |
47 | rb-d = rebase --committer-date-is-author-date | |
ca0cd585 MF |
48 | rb-a = rebase --abort |
49 | rb-c = rebase --continue | |
50 | rb-i = rebase --interactive | |
51 | rb-s = rebase --skip | |
52 | rl = rev-list | |
184f604a | 53 | se = send-email -C -M |
ef3aa4f9 | 54 | sm = submodule |
ca0cd585 | 55 | st = status |
8a3f4e0c | 56 | t = tag |
8c8b1d8e | 57 | up = upload |
f473de80 MF |
58 | [tag] |
59 | sort = version:refname | |
52887a61 MF |
60 | [merge] |
61 | conflictstyle = diff3 | |
5b7ba27c MF |
62 | [rebase] |
63 | autosquash = true | |
d42b596a MF |
64 | [http] |
65 | cookiefile = ~/.gitcookies | |
26d53874 MF |
66 | [transfer] |
67 | # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0 | |
68 | fsckobjects = true | |
db0968c6 MF |
69 | [merge "merge-changelog"] |
70 | name = GNU-style ChangeLog merge driver | |
71 | driver = /usr/bin/git-merge-changelog %O %A %B | |
5b61754d | 72 | [sendemail] |
79936f7d | 73 | chainreplyto = false |
d4284c9f | 74 | confirm = always |
5b61754d | 75 | suppressfrom = true |
f473de80 | 76 | suppresscc = author |
5b61754d | 77 | smtpserver = localhost:1111 |