From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: akpm@linux-foundation.org
Cc: linux-scsi@vger.kernel.org
Subject: Re: [patch 7/7] aic79xx_core: remove ascii art
Date: Fri, 02 May 2008 16:10:32 -0500 [thread overview]
Message-ID: <1209762632.3121.63.camel@localhost.localdomain> (raw)
In-Reply-To: <200805022044.m42Kiv17013977@imap1.linux-foundation.org>
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?
James
next prev parent reply other threads:[~2008-05-02 21:10 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 [this message]
2008-05-02 21:16 ` Andrew Morton
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=1209762632.3121.63.camel@localhost.localdomain \
--to=james.bottomley@hansenpartnership.com \
--cc=akpm@linux-foundation.org \
--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