From: Avery Pennarun <apenwarr@gmail.com>
Date: Mon, 05 Apr 2010 18:52:26 GMT
Subject: Re: Mysterious junk in file.... "not commited yet"
Message-ID: <o2n32541b131004051152ie6c82b3wdab0f38a9e657943@mail.gmail.com>
In-Reply-To: <i2v26ae428a1004051113q68a0cf13o65fbf1349f941648@mail.gmail.com>

On Mon, Apr 5, 2010 at 2:13 PM, Howard Miller
<howard@e-learndesign.co.uk> wrote:
> I just found a file in my project that has "junk" at the beginning
> (looks like some binary stuff at the start of a php file). Git status
> and diff show nothing unusual (nothing to commit). Git log shows
> nothing I wouldn't expect and show 'shows' show noting. Git blame on
> the other shows the offending line as 'not commited yet'. I tried
> doing 'git checkout <filename>' but it didn't fix it.
>
> What am I missing? Has git broken somewhere?

You might have 'git add'ed the changed line.  Try this:

   git checkout HEAD -- <filename>

Have fun,

Avery