The 07/09/09, Junio C Hamano wrote: > > * jc/mailinfo-scissors (2009-08-26) 5 commits > (merged to 'next' on 2009-08-30 at 5fc6248) > + 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() > > I didn't pick up the patch to simplify the definition of scissors. I do > not have strong opinion on it either way, and nobody on the list seemed to > care too much either. Since --scissors is an option instead of the default behaviour, I believe that the definition of scissors is much less critical. The following two patches is only about documentation. The last patch mixes documentation of both mailinfo.scissors and --no--scissors because I think they are very tied from the user POV. [PATCH 1/2] mailinfo: add '--scissors' to usage message [PATCH 2/2] add documentation for mailinfo.scissors and '--no-scissors' --- Documentation/git-am.txt | 2 +- Documentation/git-mailinfo.txt | 6 ++++++ builtin-mailinfo.c | 2 +- git-am.sh | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html