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