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