]> git.wh0rd.org - home.git/blob - .gitconfig
gitconfig: merge: add --no-stat by default
[home.git] / .gitconfig
1 [user]
2 name = Mike Frysinger
3 email = vapier@gentoo.org
4 # signingkey = 0xE837F581
5
6 [core]
7 abbrev = 12
8 pager = less -FRMX --tabs 4 -#10
9
10 [color]
11 ui = auto
12 diff = auto
13 status = auto
14
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
22
23 [diff]
24 renames = true
25
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
31 #[pager]
32 # diff = diff-highlight | less
33 # log = diff-highlight | less
34 # show = diff-highlight | less
35
36 [protocol]
37 # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
38 version = 2
39
40 [push]
41 default = current
42
43 [alias]
44 a = add
45 ab = abandon
46 am-a = am --abort
47 am-c = am --continue
48 ar = archive
49 b = branch -v
50 bi = bisect
51 cfg = config
52 ci = commit
53 co = checkout
54 cp = cherry-pick --ff
55 cp-a = cherry-pick --abort
56 cp-c = cherry-pick --continue
57 cp-x = cherry-pick -x
58 d = diff
59 desc = describe
60 dl = download
61 f = fetch
62 fp = format-patch -C -M
63 g = grep
64 h = help
65 l = log
66 lf = log --format= --name-only
67 m = merge --log=50 --no-stat
68 rb = rebase
69 rb-d = rebase --committer-date-is-author-date
70 rb-a = rebase --abort
71 rb-c = rebase --continue
72 rb-i = rebase --interactive
73 rb-s = rebase --skip
74 rl = rev-list
75 se = send-email -C -M
76 sm = submodule
77 st = status
78 t = tag
79 up = upload
80
81 [tag]
82 sort = version:refname
83
84 [merge]
85 conflictstyle = diff3
86
87 [rebase]
88 autosquash = true
89
90 [http]
91 cookiefile = ~/.gitcookies
92
93 [transfer]
94 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
95 fsckobjects = true
96
97 [merge "merge-changelog"]
98 name = GNU-style ChangeLog merge driver
99 driver = /usr/bin/git-merge-changelog %O %A %B
100
101 [sendemail]
102 chainreplyto = false
103 confirm = always
104 suppressfrom = true
105 suppresscc = author
106 smtpserver = localhost:1111