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
54 cp-a = cherry-pick --abort
55 cp-c = cherry-pick --continue
60 fp = format-patch -C -M
64 lf = log --format= --name-only
65 m = merge --log=100 --no-stat
67 rb-d = rebase --committer-date-is-author-date
69 rb-c = rebase --continue
70 rb-i = rebase --interactive
79 sort = version:refname
88 cookiefile = ~/.gitcookies
91 # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
94 [merge "merge-changelog"]
95 name = GNU-style ChangeLog merge driver
96 driver = /usr/bin/git-merge-changelog %O %A %B
103 smtpserver = localhost:1111