From: Erik V. <eri...@xs...> - 2011-08-10 18:36:35
|
A hard reset did it. Thanks. Fortunately I had nothing to commit or push, I just wanted a clean house. Now I have. Erik. > -----Original Message----- > From: brett lentz [mailto:bre...@gm...] > Sent: Wednesday, August 10, 2011 7:34 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] How to clean up the Git index? > > On Wed, Aug 10, 2011 at 10:22 AM, Erik Vos <eri...@xs...> wrote: > >> Try doing a "git diff" and see what lines it thinks are changed. > > > > None. That's why I'm baffled. > > > > Erik. > > > Strange. > > You can always do a "git reset --hard origin/master", but this will destroy any > local commits you haven't pushed. > > A less destructive method is a simple "git reset --hard", which will reset any > changes back to the state of your local HEAD. > > ---Brett. > > ------------------------------------------------------------------------------ > uberSVN's rich system and user administration capabilities and model > configuration take the hassle out of deploying and managing Subversion and > the tools developers use with it. Learn more about uberSVN and get a free > download at: http://p.sf.net/sfu/wandisco-dev2dev > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |