From: Alan Chandler Date: Sun, 03 Dec 2006 20:40:12 GMT Subject: Re: Some advanced index playing Message-ID: <200612032040.13100.alan@chandlerfamily.org.uk> In-Reply-To: On Sunday 03 December 2006 18:34, Linus Torvalds wrote: ... > So in short, you should just have done "git reset", and you'd have > reset your index back to the state of your last commit. > > So "git reset" is generally your friend whenever something goes > wrong. If you also want to reset your checked-out files (which you > did NOT want to do in this case, of course), you would have added the > "--hard" flag to git reset. Doh [slaps head with wet blanket] I was so worried about NOT changing my working tree - I totally overlooked the reset command. I had never quite understood what --mixed really meant before. But re-reading the man page now, its obvious. -- Alan Chandler