]> git.wh0rd.org - home.git/blame - .gitconfig
vcs-url: fix git arg
[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
b383b052 20 ar = archive
2eb9fcf8 21 b = branch -v
2f8ca74b 22 bi = bisect
a0b06b4f 23 cfg = config
07ed0359 24 ci = commit
ca0cd585 25 co = checkout
c725b573 26 cp = cherry-pick --ff
95f2f47b
MF
27 cp-a = cherry-pick --abort
28 cp-c = cherry-pick --continue
7fc979ec 29 cp-x = cherry-pick -x
ca0cd585 30 d = diff
631efde8 31 desc = describe
97c58010 32 dl = download
ca0cd585 33 f = fetch
70f4d7c0 34 fp = format-patch -C -M
29204785 35 g = grep
9383ff84 36 h = help
ca0cd585
MF
37 l = log
38 m = merge
9c1e8a82
MF
39 rb = rebase
40 rb-d = rebase --committer-date-is-author-date
ca0cd585
MF
41 rb-a = rebase --abort
42 rb-c = rebase --continue
43 rb-i = rebase --interactive
44 rb-s = rebase --skip
45 rl = rev-list
184f604a 46 se = send-email -C -M
ef3aa4f9 47 sm = submodule
ca0cd585 48 st = status
8a3f4e0c 49 t = tag
8c8b1d8e 50 up = upload
52887a61
MF
51[merge]
52 conflictstyle = diff3
5b7ba27c
MF
53[rebase]
54 autosquash = true
db0968c6
MF
55[merge "merge-changelog"]
56 name = GNU-style ChangeLog merge driver
57 driver = /usr/bin/git-merge-changelog %O %A %B
5b61754d 58[sendemail]
79936f7d 59 chainreplyto = false
d4284c9f 60 confirm = always
5b61754d
MF
61 suppressfrom = true
62 smtpserver = localhost:1111