t / t5100 / rfc2047-info-0003on commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4