From: "Jesper Juhl" <jesper.juhl@gmail.com>
To: "Jeff Garzik" <jeff@garzik.org>
Cc: "Robert P. J. Day" <rpjday@mindspring.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Git Mailing List" <git@vger.kernel.org>,
"Linus Torvalds" <torvalds@linux-foundation.org>
Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h?
Date: Mon, 2 Jul 2007 15:58:39 +0200 [thread overview]
Message-ID: <9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2007-07-02 13:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Pine.LNX.4.64.0707020800010.1972@localhost.localdomain>
2007-07-02 12:29 ` why does git perpetually complain about include/asm-blackfin/macros.h? Jeff Garzik
2007-07-02 13:58 ` Jesper Juhl [this message]
2007-07-02 14:10 ` Jeff Garzik
2007-07-02 14:22 ` Robert P. J. Day
2007-07-02 14:22 ` Alex Riesen
2007-07-02 14:25 ` Alex Riesen
2007-07-02 14:29 ` Marco Roeland
2007-07-02 15:09 ` [PATCH] Blackfin arch: include/asm-blackfin/macros.h die die die Marco Roeland
2007-07-03 0:39 ` Bryan Wu
2007-07-02 14:37 ` why does git perpetually complain about include/asm-blackfin/macros.h? Jeff Garzik
2007-07-14 7:45 ` Sam Ravnborg
2007-07-02 14:24 ` Marco Roeland
2007-07-03 0:28 ` Bryan Wu
2007-07-02 15:36 ` Linus Torvalds
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=9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com \
--to=jesper.juhl@gmail.com \
--cc=git@vger.kernel.org \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rpjday@mindspring.com \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).