Re: [patch 7/7] aic79xx_core: remove ascii art

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 02 May 2008 16:10:32 -0500
James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> wrote:

> On Fri, 2008-05-02 at 13:44 -0700, akpm@xxxxxxxxxxxxxxxxxxxx wrote:
> > From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> > 
> > 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 :)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Samba]     [Device Mapper]
  Powered by Linux