3 email = vapier@gentoo.org
4 # signingkey = 0xE837F581
8 skippedCherryPicks = false
12 pager = less -FRMX --tabs 4 -#10
24 whitespace = normal green
33 # Settings used by Chromium's `git cl`. The defaults are brain-dead.
35 skip-ensure-authenticated = true
36 squash-uploads = false
39 diff = diff-highlight | less
40 log = diff-highlight | less
41 show = diff-highlight | less
44 # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
63 ciaf = commit -a --fixup
65 ciaam = commit --amend -a
69 cp-a = cherry-pick --abort
70 cp-c = cherry-pick --continue
76 fp = format-patch -C -M
80 lf = log --format= --name-only
82 m = merge --log=100 --no-stat
84 rb-d = rebase --committer-date-is-author-date
86 rb-c = rebase --continue
87 rb-i = rebase --interactive
94 vl = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset'
97 sort = version:refname
100 conflictstyle = diff3
106 cookiefile = ~/.gitcookies
112 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
118 [merge "merge-changelog"]
119 name = GNU-style ChangeLog merge driver
120 driver = /usr/bin/git-merge-changelog %O %A %B
127 transferEncoding = 8bit
128 # composeencoding = utf-8
129 assume8bitEncoding = 8bit
131 sendmailcmd = ssh dev /usr/sbin/sendmail
132 # smtpEncryption = tls
133 # smtpServer = smtp.gentoo.org