3 email = vapier@gentoo.org
4 # signingkey = 0xE837F581
11 pager = less -FRMX --tabs 4 -#10
23 whitespace = normal green
32 # Settings used by Chromium's `git cl`. The defaults are brain-dead.
34 skip-ensure-authenticated = true
35 squash-uploads = false
38 diff = diff-highlight | less
39 log = diff-highlight | less
40 show = diff-highlight | less
43 # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
62 ciaf = commit -a --fixup
64 ciaam = commit --amend -a
68 cp-a = cherry-pick --abort
69 cp-c = cherry-pick --continue
75 fp = format-patch -C -M
79 lf = log --format= --name-only
81 m = merge --log=100 --no-stat
83 rb-d = rebase --committer-date-is-author-date
85 rb-c = rebase --continue
86 rb-i = rebase --interactive
93 vl = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset'
96 sort = version:refname
105 cookiefile = ~/.gitcookies
108 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
114 [merge "merge-changelog"]
115 name = GNU-style ChangeLog merge driver
116 driver = /usr/bin/git-merge-changelog %O %A %B
123 smtpserver = localhost:1111
124 transferEncoding = 8bit
125 # composeencoding = utf-8
126 assume8bitEncoding = 8bit