]> git.wh0rd.org - home.git/blame - .gitconfig
merge firefox/aspell/chrome dicts
[home.git] / .gitconfig
CommitLineData
5b61754d
MF
1[user]
2 name = Mike Frysinger
3 email = vapier@gentoo.org
4[color]
1afdf944 5 ui = auto
5b61754d
MF
6 diff = auto
7 status = auto
8[color "diff"]
9 old = red bold
10 new = green bold
11 plain = blue bold
12 frag = yellow bold
13 whitespace = normal green
14 meta = magenta
a2c26b73
MF
15[push]
16 default = current
ca0cd585
MF
17[alias]
18 a = add
35c220c5 19 ab = abandon
ca0cd585 20 b = branch
2f8ca74b 21 bi = bisect
07ed0359 22 ci = commit
ca0cd585
MF
23 co = checkout
24 cp = cherry-pick
25 d = diff
26 f = fetch
27 fp = format-patch
28 l = log
29 m = merge
30 rb = rebase
31 rb-a = rebase --abort
32 rb-c = rebase --continue
33 rb-i = rebase --interactive
34 rb-s = rebase --skip
35 rl = rev-list
184f604a 36 se = send-email -C -M
ef3aa4f9 37 sm = submodule
ca0cd585 38 st = status
8a3f4e0c 39 t = tag
8c8b1d8e 40 up = upload
52887a61
MF
41[merge]
42 conflictstyle = diff3
5b7ba27c
MF
43[rebase]
44 autosquash = true
5b61754d 45[sendemail]
79936f7d 46 chainreplyto = false
5b61754d
MF
47 suppressfrom = true
48 smtpserver = localhost:1111
49# smtpserver = zeus.spd.analog.com