3 email = vapier@gentoo.org
4 # signingkey = 0xE837F581
8 pager = less -FRMX --tabs 4 -#10
20 whitespace = normal green
26 # Settings used by Chromium's `git cl`. The defaults are brain-dead.
28 skip-ensure-authenticated = true
29 squash-uploads = false
32 diff = diff-highlight | less
33 log = diff-highlight | less
34 show = diff-highlight | less
37 # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
56 ciaf = commit -a --fixup
58 ciaam = commit --amend -a
62 cp-a = cherry-pick --abort
63 cp-c = cherry-pick --continue
69 fp = format-patch -C -M
73 lf = log --format= --name-only
74 m = merge --log=100 --no-stat
76 rb-d = rebase --committer-date-is-author-date
78 rb-c = rebase --continue
79 rb-i = rebase --interactive
88 sort = version:refname
97 cookiefile = ~/.gitcookies
100 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
106 [merge "merge-changelog"]
107 name = GNU-style ChangeLog merge driver
108 driver = /usr/bin/git-merge-changelog %O %A %B
115 smtpserver = localhost:1111
116 transferEncoding = 8bit
117 # composeencoding = utf-8
118 assume8bitEncoding = 8bit