3 email = vapier@gentoo.org
13 whitespace = normal green
29 cp-a = cherry-pick --abort
30 cp-c = cherry-pick --continue
36 fp = format-patch -C -M
42 rb-d = rebase --committer-date-is-author-date
44 rb-c = rebase --continue
45 rb-i = rebase --interactive
54 sort = version:refname
59 [merge "merge-changelog"]
60 name = GNU-style ChangeLog merge driver
61 driver = /usr/bin/git-merge-changelog %O %A %B
67 smtpserver = localhost:1111