diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-07 15:34:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-07 15:34:06 -0700 |
| commit | d6b5af6d7636979220bc36872eeeebea15b2ad22 (patch) | |
| tree | 66feaa9e753e342d1ee8fed29edae84536d68d2e /builtin | |
| parent | e3af3cfc401420242a4a8873405f62e1aee5355b (diff) | |
| parent | 9974e290e7c207de569ee24356253a69e5955e67 (diff) | |
| download | git-d6b5af6d7636979220bc36872eeeebea15b2ad22.tar.gz git-d6b5af6d7636979220bc36872eeeebea15b2ad22.tar.xz | |
Merge branch 'jn/mailinfo-scissors'
* jn/mailinfo-scissors:
Teach mailinfo %< as an alternative scissors mark
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mailinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index ce2ef6bed..4a9729b9b 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -746,7 +746,8 @@ static int is_scissors_line(const struct strbuf *line) continue; } if (i + 1 < len && - (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2))) { + (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2) || + !memcmp(buf + i, ">%", 2) || !memcmp(buf + i, "%<", 2))) { in_perforation = 1; perforation += 2; scissors += 2; |