From: Andrew Morton <akpm@linux-foundation.org>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: linux-scsi@vger.kernel.org
Subject: Re: [patch 7/7] aic79xx_core: remove ascii art
Date: Fri, 2 May 2008 14:16:41 -0700 [thread overview]
Message-ID: <20080502141641.99fd8c65.akpm@linux-foundation.org> (raw)
In-Reply-To: <1209762632.3121.63.camel@localhost.localdomain>
On Fri, 02 May 2008 16:10:32 -0500
James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> On Fri, 2008-05-02 at 13:44 -0700, akpm@linux-foundation.org wrote:
> > From: Andrew Morton <akpm@linux-foundation.org>
> >
> > Those '<<<<<<<' lines keep on emitting false-positives when I'm grepping for
> > git conflicts. Replace them with '='.
>
> I'm not opposed to this in principle, but I have to ask how? The grep
> for conflicts remaining in a file is
>
> egrep '^<<<<<<<|^=======|^>>>>>>' <file>
>
> Which doesn't match anything in the aic7xxx directory. If you're
> grepping without the anchor, then you're going to get another match
> looking for ===== with your change, aren't you?
Yeah, I'm being lazy. Might as well drop it and I'll do more typing :)
next prev parent reply other threads:[~2008-05-02 21:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-02 20:44 [patch 7/7] aic79xx_core: remove ascii art akpm
2008-05-02 21:10 ` James Bottomley
2008-05-02 21:16 ` Andrew Morton [this message]
2008-05-03 5:00 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080502141641.99fd8c65.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox