3 email = vapier@gentoo.org
13 whitespace = normal green
27 cp-a = cherry-pick --abort
28 cp-c = cherry-pick --continue
34 fp = format-patch -C -M
39 rb = rebase --committer-date-is-author-date
41 rb-c = rebase --continue
42 rb-i = rebase --interactive
54 [merge "merge-changelog"]
55 name = GNU-style ChangeLog merge driver
56 driver = /usr/bin/git-merge-changelog %O %A %B
61 smtpserver = localhost:1111