Code

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)
* ls/maint-mailinfo-no-inbody:
  git am/mailinfo: Don't look at in-body headers when rebasing

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge