dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.

[profile] / dot / mailrc

diff --git a/dot/mailrc b/dot/mailrc
index edc41d5..09be5e7 100644 (file)
--- a/dot/mailrc
+++ b/dot/mailrc
@@ -1,7 +1,7 @@
 set MBOX=~/INBOX folder=Mail searchheaders dot ask indentprefix="> "
-set append crt Replyall record=+sent
+set append crt Replyall record=+sent sign="-- [mdw]" hold
 set EDITOR=ed
-unset hold askcc askbcc autoprint save
+unset askcc askbcc autoprint save
 retain From To Cc Bcc Subject Return-Path Delivered-To Date
 # alias clive clive@dgw.co.uk
 alias dad binswood@googlemail.com
@@ -14,3 +14,5 @@ alias ham ham@distorted.org.uk
 alias band hibachi-dealers-members@chiark.greenend.org.uk
 alias vicky vicky@harlequin.org.uk
 alias bug submit@bugs.distorted.org.uk
+alias rejs rejs@cynic.org.uk
+alias steal "Phillip Rogaway <rogaway@cs.ucdavis.edu>" "Haibin Zhang <hbzhang@ucdavis.edu>"