diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-07 15:25:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-07 15:25:37 -0700 |
| commit | b8711f520b35bde33b0e433b72e29d8f6b7551d9 (patch) | |
| tree | 2c7e8fc144067190dcc9e583e4120e68860391cf /t/t5100/msg0014 | |
| parent | 2da9f8e370b08d4786e33ec95a07a4d6104eb83a (diff) | |
| parent | 43485d3d16e4fe221ac79fd53c0a2fe38f9ea5cb (diff) | |
| download | git-b8711f520b35bde33b0e433b72e29d8f6b7551d9.tar.gz | |
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()
Diffstat (limited to 't/t5100/msg0014')
| -rw-r--r-- | t/t5100/msg0014 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t5100/msg0014 b/t/t5100/msg0014 new file mode 100644 index 0000000000..62e5cd2ecd --- /dev/null +++ b/t/t5100/msg0014 @@ -0,0 +1,18 @@ +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. + +Signed-off-by: Junio C Hamano <gitster@pobox.com> |