]> git.wh0rd.org - home.git/blob - .gitconfig
nanorc: update bindings
[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 cia = commit -a
56 ciaf = commit -a --fixup
57 ciam = commit --amend
58 ciaam = commit --amend -a
59 cif = commit --fixup
60 co = checkout
61 cp = cherry-pick --ff
62 cp-a = cherry-pick --abort
63 cp-c = cherry-pick --continue
64 cp-x = cherry-pick -x
65 d = diff
66 dc = diff --cached
67 desc = describe
68 f = fetch
69 fp = format-patch -C -M
70 g = grep
71 h = help
72 l = log
73 lf = log --format= --name-only
74 m = merge --log=100 --no-stat
75 rb = rebase
76 rb-d = rebase --committer-date-is-author-date
77 rb-a = rebase --abort
78 rb-c = rebase --continue
79 rb-i = rebase --interactive
80 rb-s = rebase --skip
81 rl = rev-list
82 se = send-email -C -M
83 sm = submodule
84 st = status
85 t = tag
86
87 [tag]
88 sort = version:refname
89
90 [merge]
91 conflictstyle = diff3
92
93 [rebase]
94 autosquash = true
95
96 [http]
97 cookiefile = ~/.gitcookies
98
99 [transfer]
100 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
101 fsckobjects = true
102
103 [init]
104 defaultBranch = main
105
106 [merge "merge-changelog"]
107 name = GNU-style ChangeLog merge driver
108 driver = /usr/bin/git-merge-changelog %O %A %B
109
110 [sendemail]
111 chainreplyto = false
112 confirm = always
113 suppressfrom = true
114 suppresscc = author
115 smtpserver = localhost:1111
116 transferEncoding = 8bit
117 # composeencoding = utf-8
118 assume8bitEncoding = 8bit