Re: git am and the wrong chunk of ---

2012-08-10 Thread H. Peter Anvin
On 08/10/2012 09:15 AM, Junio C Hamano wrote: > "H. Peter Anvin" writes: > >> The users I am referring to generally have a --- line, rather than >> a scissor, between the cover text and commit. Also, there is >> (almost) always a From: line and subject at the top of the patch >> proper. > > Oh,

Re: git am and the wrong chunk of ---

2012-08-10 Thread Junio C Hamano
"H. Peter Anvin" writes: > The users I am referring to generally have a --- line, rather than > a scissor, between the cover text and commit. Also, there is > (almost) always a From: line and subject at the top of the patch > proper. Oh, so it is more like this? From: author name Date

Re: git am and the wrong chunk of ---

2012-08-10 Thread H. Peter Anvin
The users I am referring to generally have a --- line, rather than a scissor, between the cover text and commit. Also, there is (almost) always a From: line and subject at the top of the patch proper. Junio C Hamano wrote: >Jeff King writes: > >> If I understand your issue, somebody is writi

Re: git am and the wrong chunk of ---

2012-08-10 Thread Junio C Hamano
Jeff King writes: > If I understand your issue, somebody is writing: > > > From: them > To: you > Date: ... > Subject: [PATCH] subject line > > commit message body > > > some cover letter material that should go below the "---" > --- > [diffstat + diff]

Re: git am and the wrong chunk of ---

2012-08-10 Thread Andreas Ericsson
On 08/10/2012 12:36 PM, Jeff King wrote: > On Thu, Aug 09, 2012 at 05:13:51PM -0700, H. Peter Anvin wrote: > >> I have some contributors who consistently put their commentary >> *before* the "---" line rather than *after* it, presumably with the >> notion that it is some kind of "cover text". Thi

Re: git am and the wrong chunk of ---

2012-08-10 Thread Jeff King
On Thu, Aug 09, 2012 at 05:13:51PM -0700, H. Peter Anvin wrote: > I have some contributors who consistently put their commentary > *before* the "---" line rather than *after* it, presumably with the > notion that it is some kind of "cover text". This messes with "git > am", and so I end up having

Re: git am and the wrong chunk of ---

2012-08-09 Thread Junio C Hamano
"H. Peter Anvin" writes: > Hello, > > I have some contributors who consistently put their commentary > *before* the "---" line rather than *after* it, presumably with the > notion that it is some kind of "cover text". This messes with "git > am", and so I end up having to edit those posts manual

git am and the wrong chunk of ---

2012-08-09 Thread H. Peter Anvin
Hello, I have some contributors who consistently put their commentary *before* the "---" line rather than *after* it, presumably with the notion that it is some kind of "cover text". This messes with "git am", and so I end up having to edit those posts manually. I have tried git am --scisso