diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-27 08:36:05 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 09:22:22 +0400 |
| commit | 017678b4f47dc1b2a6691631373c46daf8f63206 (patch) | |
| tree | cf2a657570db595a71a35f7820a80eb2ded84309 /t/t5100/msg0014 | |
| parent | f43c97f5720f48598e59629f7dc9892d082d8b0e (diff) | |
am/mailinfo: Disable scissors processing by default
You can enable it by giving --scissors to "git am".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/msg0014')
| -rw-r--r-- | t/t5100/msg0014 | 14 |
1 files changed, 14 insertions, 0 deletions
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 <gitster@pobox.com> + This teaches mailinfo the scissors -- >8 -- mark; the command ignores everything before it in the message body. |