]> git.wh0rd.org - home.git/blame - .gitconfig
cros-board: fix recovery listing
[home.git] / .gitconfig
CommitLineData
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
b383b052 25 ar = archive
2eb9fcf8 26 b = branch -v
2f8ca74b 27 bi = bisect
a0b06b4f 28 cfg = config
07ed0359 29 ci = commit
ca0cd585 30 co = checkout
c725b573 31 cp = cherry-pick --ff
95f2f47b
MF
32 cp-a = cherry-pick --abort
33 cp-c = cherry-pick --continue
7fc979ec 34 cp-x = cherry-pick -x
ca0cd585 35 d = diff
631efde8 36 desc = describe
97c58010 37 dl = download
ca0cd585 38 f = fetch
70f4d7c0 39 fp = format-patch -C -M
29204785 40 g = grep
9383ff84 41 h = help
ca0cd585
MF
42 l = log
43 m = merge
9c1e8a82
MF
44 rb = rebase
45 rb-d = rebase --committer-date-is-author-date
ca0cd585
MF
46 rb-a = rebase --abort
47 rb-c = rebase --continue
48 rb-i = rebase --interactive
49 rb-s = rebase --skip
50 rl = rev-list
184f604a 51 se = send-email -C -M
ef3aa4f9 52 sm = submodule
ca0cd585 53 st = status
8a3f4e0c 54 t = tag
8c8b1d8e 55 up = upload
f473de80
MF
56[tag]
57 sort = version:refname
52887a61
MF
58[merge]
59 conflictstyle = diff3
5b7ba27c
MF
60[rebase]
61 autosquash = true
d42b596a
MF
62[http]
63 cookiefile = ~/.gitcookies
26d53874
MF
64[transfer]
65 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
66 fsckobjects = true
db0968c6
MF
67[merge "merge-changelog"]
68 name = GNU-style ChangeLog merge driver
69 driver = /usr/bin/git-merge-changelog %O %A %B
5b61754d 70[sendemail]
79936f7d 71 chainreplyto = false
d4284c9f 72 confirm = always
5b61754d 73 suppressfrom = true
f473de80 74 suppresscc = author
5b61754d 75 smtpserver = localhost:1111