]> git.wh0rd.org - home.git/blob - .gitconfig
gitconfig: add am-{a,c} helpers
[home.git] / .gitconfig
1 [user]
2 name = Mike Frysinger
3 email = vapier@gentoo.org
4 # signingkey = 0xE837F581
5 [core]
6 abbrev = 12
7 [color]
8 ui = auto
9 diff = auto
10 status = auto
11 [color "diff"]
12 old = red bold
13 new = green bold
14 plain = blue bold
15 frag = yellow bold
16 whitespace = normal green
17 meta = magenta
18 [diff]
19 renames = true
20 [push]
21 default = current
22 [alias]
23 a = add
24 ab = abandon
25 am-a = am --abort
26 am-c = am --continue
27 ar = archive
28 b = branch -v
29 bi = bisect
30 cfg = config
31 ci = commit
32 co = checkout
33 cp = cherry-pick --ff
34 cp-a = cherry-pick --abort
35 cp-c = cherry-pick --continue
36 cp-x = cherry-pick -x
37 d = diff
38 desc = describe
39 dl = download
40 f = fetch
41 fp = format-patch -C -M
42 g = grep
43 h = help
44 l = log
45 m = merge
46 rb = rebase
47 rb-d = rebase --committer-date-is-author-date
48 rb-a = rebase --abort
49 rb-c = rebase --continue
50 rb-i = rebase --interactive
51 rb-s = rebase --skip
52 rl = rev-list
53 se = send-email -C -M
54 sm = submodule
55 st = status
56 t = tag
57 up = upload
58 [tag]
59 sort = version:refname
60 [merge]
61 conflictstyle = diff3
62 [rebase]
63 autosquash = true
64 [http]
65 cookiefile = ~/.gitcookies
66 [transfer]
67 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
68 fsckobjects = true
69 [merge "merge-changelog"]
70 name = GNU-style ChangeLog merge driver
71 driver = /usr/bin/git-merge-changelog %O %A %B
72 [sendemail]
73 chainreplyto = false
74 confirm = always
75 suppressfrom = true
76 suppresscc = author
77 smtpserver = localhost:1111