the fish epic » git

git woe: git checkout not resetting my file?!

Lo — Sat, 19 Jun 2010 01:26:53 +0000

Jotting this down for posterity:

If I want to add a file to the index to be committed and then don’t commit it, and then want to pull a newer version of the file from remote, well uh, I can’t do that. Git will say “you have changes to this file that you didn’t commit! commit or stash it first plz.”

Do: git reset HEAD and unstage the file.

Don’t: git checkout over and over and hit the return carriage with rage because it doesn’t really fix anything.

Geeky colleagues

Lo — Fri, 16 Jan 2009 00:40:46 +0000

They make a workplace fun! Joao is sicking ubuntu on his AAO and Arash is learning Vim. We’re all using IRC and Git. It might be hard to believe but these are recent developments here. We’re still fighting some policy issues with some of the technology but when your bosses are pretty on board, life feels golden. I’ve just given gimphoto+gimpad a shot and will see if Thunderbird plays nice with the Exchange server. If it does, it’s supposed to be a huge speed boost.