git reset --hard isn't resetting

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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")
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux