From: Avery Pennarun <apenwarr@gmail.com>
To: Howard Miller <howard@e-learndesign.co.uk>
Cc: git@vger.kernel.org
Subject: Re: Mysterious junk in file.... "not commited yet"
Date: Mon, 5 Apr 2010 14:52:26 -0400 [thread overview]
Message-ID: <o2n32541b131004051152ie6c82b3wdab0f38a9e657943@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2010-04-05 18:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-05 18:13 Mysterious junk in file.... "not commited yet" Howard Miller
2010-04-05 18:52 ` Avery Pennarun [this message]
2010-04-05 19:03 ` Howard Miller
2010-04-05 19:13 ` Avery Pennarun
2010-04-05 19:24 ` Matthieu Moy
2010-04-05 19:29 ` Howard Miller
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=o2n32541b131004051152ie6c82b3wdab0f38a9e657943@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=howard@e-learndesign.co.uk \
/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).