[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-rtc
Subject:    Re: [PATCH v1 1/3] rtc: cmos: Stop using shared IRQ
From:       Andy Shevchenko <andriy.shevchenko () linux ! intel ! com>
Date:       2020-01-23 8:08:24
Message-ID: 20200123080824.GT32742 () smile ! fi ! intel ! com
[Download RAW message or body]

On Wed, Jan 22, 2020 at 05:05:15PM -0300, Guilherme Piccoli wrote:
> On Wed, Jan 22, 2020 at 4:58 PM Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> 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.

For the record it's '--- ' (mind the whitespace at the end).

> Anyway, hope your commit message don't get messed in the merge heh

I'll send a new version.

-- 
With Best Regards,
Andy Shevchenko


[prev in list] [next in list] [prev in thread] [next in thread]