From: Jeff King <peff@peff.net>
To: "Chris.Cheney" <chris.cheney.nospam@tesco.net>
Cc: git@vger.kernel.org
Subject: Re: git checkout branch puzzle
Date: Sun, 2 May 2010 00:59:01 -0400 [thread overview]
Message-ID: <20100502045901.GD14776@coredump.intra.peff.net> (raw)
In-Reply-To: <Xns9D6BC0C4C8784ChrisCheneytesconet@80.91.229.10>
On Sat, May 01, 2010 at 05:55:47PM +0000, Chris.Cheney wrote:
> I have been using msysgit (curently 1.7.0.2.msysgit.0) for about 18 months
> and thought that I had managed to understand most things. However, the
> following sequence has me baffled:
>
> a) on branch 'master', git status shows that the working directory is clean
>
> b) git checkout HEAD^ gives the usual moan about moving to a head which
> isn't a local branch
>
> c) git checkout master followed by git status gives "changed but not
> updated" and a list of "modified" files
Part (c) shouldn't show anything in "git status". I wonder if it is a
line-ending conversion issue, since you are using msysgit, and since
that is the usual culprit for files mysteriously looking changed. Might
you have recently changed the settings of core.autocrlf?
-Peff
next prev parent reply other threads:[~2010-05-02 4:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-01 17:55 git checkout branch puzzle Chris.Cheney
2010-05-02 4:59 ` Jeff King [this message]
2010-05-02 8:58 ` Chris.Cheney
2010-05-02 20:09 ` Chris.Cheney
2010-05-03 6:40 ` Jeff King
2010-05-03 8:06 ` Chris.Cheney
2010-05-06 20:30 ` Chris.Cheney
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=20100502045901.GD14776@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=chris.cheney.nospam@tesco.net \
--cc=git@vger.kernel.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).