From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Mon, 02 Jul 2007 13:58:39 GMT
Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h?
Message-ID: <9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com>
In-Reply-To: <4688EF9B.8020405@garzik.org>

On 02/07/07, Jeff Garzik <jeff@garzik.org> wrote:
> Robert P. J. Day wrote:
> >   for the umpteenth time, after doing a pull, i see this:
> >
> > $ git diff
> > diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h
> > deleted file mode 100644
> > index e69de29..0000000
> > $
>
> I have the same problem.  git 1.5.0.6 on Fedora Core 5 or 6.
>
> I even tried a completely fresh clone, but the problem still appears.
>
I've seen that as well, but in my case doing a
$ git reset --hard master
fixed it.

-- 
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html