From 200c75f0d6c83039c201ec6784e4ef3fb95f8fcf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 23 Aug 2009 01:56:19 -0700 Subject: Teach mailinfo to ignore everything before -- >8 -- mark This teaches mailinfo the scissors -- >8 -- mark; the command ignores everything before it in the message body. For lefties among us, we also support -- 8< -- ;-) Signed-off-by: Junio C Hamano --- t/t5100/msg0014 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 t/t5100/msg0014 (limited to 't/t5100/msg0014') diff --git a/t/t5100/msg0014 b/t/t5100/msg0014 new file mode 100644 index 0000000000..259c6a46d2 --- /dev/null +++ b/t/t5100/msg0014 @@ -0,0 +1,4 @@ +This teaches mailinfo the scissors -- >8 -- mark; the command ignores +everything before it in the message body. + +Signed-off-by: Junio C Hamano -- cgit v1.2.3 From 017678b4f47dc1b2a6691631373c46daf8f63206 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 26 Aug 2009 21:36:05 -0700 Subject: am/mailinfo: Disable scissors processing by default You can enable it by giving --scissors to "git am". Signed-off-by: Junio C Hamano --- t/t5100/msg0014 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 't/t5100/msg0014') diff --git a/t/t5100/msg0014 b/t/t5100/msg0014 index 259c6a46d2..62e5cd2ecd 100644 --- a/t/t5100/msg0014 +++ b/t/t5100/msg0014 @@ -1,3 +1,17 @@ +In real life, we will see a discussion that inspired this patch +discussing related and unrelated things around >8 scissors mark +in this part of the message. + +Subject: [PATCH] BLAH TWO + +And then we will see the scissors. + + This line is not a scissors mark -- >8 -- but talks about it. + - - >8 - - please remove everything above this line - - >8 - - + +Subject: [PATCH] Teach mailinfo to ignore everything before -- >8 -- mark +From: Junio C Hamano + This teaches mailinfo the scissors -- >8 -- mark; the command ignores everything before it in the message body. -- cgit v1.2.3