Merge branch 'ls/maint-mailinfo-no-inbody' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:16 +0000 (13:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:16 +0000 (13:52 -0800)
commit2936824af2c0dab34c0566ae1984e47a44be77af
treed3f70d9d1cad6e01afa8f2c536aef136eeb745ca
parent3c362d4baa877bb9c6c332cfdc3aa81461e06024
parentd25e51596be9271ad833805a3d6f9012dc24ee79
Merge branch 'ls/maint-mailinfo-no-inbody' into maint

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