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