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