]> git.wh0rd.org - home.git/blob - .gitconfig
screenrc: unbind more shortcuts
[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 [pull]
41 ff = only
42
43 [push]
44 default = current
45
46 [alias]
47 a = add
48 am-a = am --abort
49 am-c = am --continue
50 ar = archive
51 b = branch -v
52 bi = bisect
53 cfg = config
54 ci = commit
55 ciam = commit --amend
56 co = checkout
57 cp = cherry-pick --ff
58 cp-a = cherry-pick --abort
59 cp-c = cherry-pick --continue
60 cp-x = cherry-pick -x
61 d = diff
62 desc = describe
63 f = fetch
64 fp = format-patch -C -M
65 g = grep
66 h = help
67 l = log
68 lf = log --format= --name-only
69 m = merge --log=100 --no-stat
70 rb = rebase
71 rb-d = rebase --committer-date-is-author-date
72 rb-a = rebase --abort
73 rb-c = rebase --continue
74 rb-i = rebase --interactive
75 rb-s = rebase --skip
76 rl = rev-list
77 se = send-email -C -M
78 sm = submodule
79 st = status
80 t = tag
81
82 [tag]
83 sort = version:refname
84
85 [merge]
86 conflictstyle = diff3
87
88 [rebase]
89 autosquash = true
90
91 [http]
92 cookiefile = ~/.gitcookies
93
94 [transfer]
95 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
96 fsckobjects = true
97
98 [init]
99 defaultBranch = main
100
101 [merge "merge-changelog"]
102 name = GNU-style ChangeLog merge driver
103 driver = /usr/bin/git-merge-changelog %O %A %B
104
105 [sendemail]
106 chainreplyto = false
107 confirm = always
108 suppressfrom = true
109 suppresscc = author
110 smtpserver = localhost:1111
111 transferEncoding = 8bit
112 # composeencoding = utf-8
113 assume8bitEncoding = 8bit