From: "Matt Graham" <mdg149@gmail.com>
To: git@vger.kernel.org
Subject: git reset --hard isn't resetting
Date: Wed, 6 Aug 2008 12:41:43 -0400 [thread overview]
Message-ID: <1c5969370808060941q59cb8f7fhabee3ef3c5107715@mail.gmail.com> (raw)
Hi,
I'm using a git svn tree in Cygwin. I tried doing an svn rebase and
got in some weird state with local changes I can't get rid of. It's
not an issue w/ the same repository on my linux machine.
git reset --hard
toggles 4 files between capitalization. The files don't appear to
have changed case in svn, but it's a huge repository and not easy to
determine with certainty.
I first encountered this during a rebase, so I rebranched master from
git-svn HEAD and the problem followed me there.
Any tips about how to work around it or investigate further would be
appreciated.
scrollback of toggling filenames is pasted below.
thanks
mgraham@mgraham-wks /src/project.git
$ git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: dim_grade.dsx
# modified: dim_institution.dsx
# modified: dim_section.dsx
# modified: dim_term.dsx
#
no changes added to commit (use "git add" and/or "git commit -a")
mgraham@mgraham-wks /src/project.git
$ git reset --hard
HEAD is now at 6170b8f RPrasad - For the time being switched to
MockAuthenticator; while working on resolving the LDAP issue.
mgraham@mgraham-wks /src/project.git
$ git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: DIM_GRADE.dsx
# modified: DIM_INSTITUTION.dsx
# modified: DIM_SECTION.dsx
# modified: DIM_TERM.dsx
#
no changes added to commit (use "git add" and/or "git commit -a")
next reply other threads:[~2008-08-06 16:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-06 16:41 Matt Graham [this message]
2008-08-06 18:01 ` git reset --hard isn't resetting Dmitry Potapov
2008-08-06 18:02 ` Avery Pennarun
2008-08-08 1:06 ` Matt Graham
2008-08-08 14:40 ` Avery Pennarun
2008-08-09 8:08 ` Eric Wong
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=1c5969370808060941q59cb8f7fhabee3ef3c5107715@mail.gmail.com \
--to=mdg149@gmail.com \
--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).