On Wed, Jan 22, 2020 at 4:58 PM Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote: > [...] > > The only oddity here is about the scissors, I'm not sure how it is > > supposed to work on git, but when I git am'ed the patch, the commit > > message was only "As reported by Guilherme G. Piccoli:", everything > > else was dropped. > > I didn't read any RFC or document about '--- ' line. But seems either bug in > git-am, or I have to put something else at the beginning of those lines. > Interesting! What I usually do is to add comments to-be-disregarded-on-merge right below "---", before the diff starts. Git will discard this full block. I guess probably having the "---" on top makes Git discard everything below it until the diff. Anyway, hope your commit message don't get messed in the merge heh Cheers, Guilherme
