Merge branch 'ls/maint-mailinfo-no-inbody'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:40:26 +0000 (16:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:40:26 +0000 (16:40 -0800)
commit6d975c24a96d607061dbcf354a50dc8410ed4b55
treec94dcb149e3caa50db08c5b4fe4d360844e13a13
parent4075d27a65e00e8eb5124b70a37f6d25c5b14d35
parentd25e51596be9271ad833805a3d6f9012dc24ee79
Merge branch 'ls/maint-mailinfo-no-inbody'

* ls/maint-mailinfo-no-inbody:
  git am/mailinfo: Don't look at in-body headers when rebasing
git-am.sh