3 email = vapier@gentoo.org
4 # signingkey = 0xE837F581
14 whitespace = normal green
30 cp-a = cherry-pick --abort
31 cp-c = cherry-pick --continue
37 fp = format-patch -C -M
43 rb-d = rebase --committer-date-is-author-date
45 rb-c = rebase --continue
46 rb-i = rebase --interactive
55 sort = version:refname
60 [merge "merge-changelog"]
61 name = GNU-style ChangeLog merge driver
62 driver = /usr/bin/git-merge-changelog %O %A %B
68 smtpserver = localhost:1111