]> git.wh0rd.org - home.git/blame - .gitconfig
gdbinit: split up & migrate some to python
[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
4db942a3
MF
36[protocol]
37 # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
38 version = 2
39
a2c26b73
MF
40[push]
41 default = current
454198a8 42
ca0cd585
MF
43[alias]
44 a = add
4ca6dd0f
MF
45 am-a = am --abort
46 am-c = am --continue
b383b052 47 ar = archive
2eb9fcf8 48 b = branch -v
2f8ca74b 49 bi = bisect
a0b06b4f 50 cfg = config
07ed0359 51 ci = commit
ca0cd585 52 co = checkout
c725b573 53 cp = cherry-pick --ff
95f2f47b
MF
54 cp-a = cherry-pick --abort
55 cp-c = cherry-pick --continue
7fc979ec 56 cp-x = cherry-pick -x
ca0cd585 57 d = diff
631efde8 58 desc = describe
ca0cd585 59 f = fetch
70f4d7c0 60 fp = format-patch -C -M
29204785 61 g = grep
9383ff84 62 h = help
ca0cd585 63 l = log
5d0b4331 64 lf = log --format= --name-only
64e2994f 65 m = merge --log=50 --no-stat
9c1e8a82
MF
66 rb = rebase
67 rb-d = rebase --committer-date-is-author-date
ca0cd585
MF
68 rb-a = rebase --abort
69 rb-c = rebase --continue
70 rb-i = rebase --interactive
71 rb-s = rebase --skip
72 rl = rev-list
184f604a 73 se = send-email -C -M
ef3aa4f9 74 sm = submodule
ca0cd585 75 st = status
8a3f4e0c 76 t = tag
454198a8 77
f473de80
MF
78[tag]
79 sort = version:refname
454198a8 80
52887a61
MF
81[merge]
82 conflictstyle = diff3
454198a8 83
5b7ba27c
MF
84[rebase]
85 autosquash = true
454198a8 86
d42b596a
MF
87[http]
88 cookiefile = ~/.gitcookies
454198a8 89
26d53874
MF
90[transfer]
91 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
92 fsckobjects = true
454198a8 93
db0968c6
MF
94[merge "merge-changelog"]
95 name = GNU-style ChangeLog merge driver
96 driver = /usr/bin/git-merge-changelog %O %A %B
454198a8 97
5b61754d 98[sendemail]
79936f7d 99 chainreplyto = false
d4284c9f 100 confirm = always
5b61754d 101 suppressfrom = true
f473de80 102 suppresscc = author
5b61754d 103 smtpserver = localhost:1111