Merge branch 'jc/mailinfo-scissors'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Sep 2009 22:25:37 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Sep 2009 22:25:37 +0000 (15:25 -0700)
* jc/mailinfo-scissors:
mailinfo.scissors: new configuration
am/mailinfo: Disable scissors processing by default
Documentation: describe the scissors mark support of "git am"
Teach mailinfo to ignore everything before -- >8 -- mark
builtin-mailinfo.c: fix confusing internal API to mailinfo()

Trivial merge