From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Sep 2009 22:25:37 +0000 (-0700)
Subject: Merge branch 'jc/mailinfo-scissors'
X-Git-Tag: v1.6.5-rc0~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8711f520b35bde33b0e433b72e29d8f6b7551d9;p=git.git

Merge branch 'jc/mailinfo-scissors'

* 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()
---

b8711f520b35bde33b0e433b72e29d8f6b7551d9