Merge branch 'jc/mailinfo-scissors' into next
commit5fc6248250e68c3b723efb9b868d8fc27499065a
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2009 06:52:43 +0000 (30 23:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2009 06:52:43 +0000 (30 23:52 -0700)
tree832ae114d6934cd6bdf96781a3e9ac0266f07f67
parente4edd0b3658cddc47762ebc0d29ecaf0eebdd52c
parent43485d3d16e4fe221ac79fd53c0a2fe38f9ea5cb
Merge branch 'jc/mailinfo-scissors' into next

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