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