![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Sep 2009 22:25:37 +0000 (15:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Sep 2009 22:25:37 +0000 (15:25 -0700) | ||
| commit | b8711f520b35bde33b0e433b72e29d8f6b7551d9 | |
| tree | 2c7e8fc144067190dcc9e583e4120e68860391cf | tree | snapshot |
| parent | 2da9f8e370b08d4786e33ec95a07a4d6104eb83a | commit | diff |
| parent | 43485d3d16e4fe221ac79fd53c0a2fe38f9ea5cb | commit | diff |
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()
* 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()