Monthly Archives: March 2010

LosTechies welcomes Scott Gillenwater

Due to Joe welcoming his new baby boy into the world recently, he’s asked me to introduce you all to Scott Gillenwater, a new addition to our group. Scott works with both Joe and I at Rackspace where he is … Continue reading 

Posted in members | Comments Off

Git tracking branches

I have encountered this message multiple times when dealing with Git: ~/code/blog/armmer.github.com(master) $ git pull You asked me to pull without telling me which branch you want to merge with, and ‘branch.master.merge’ in your configuration file does not tell me, … Continue reading 

Posted in git | 4 Comments

Git reset, checkout & "bare double dash", and revert

UPDATE: Please make sure to read Alexander’s comments on git rebase –interactive UPDATE: If you need to unstage a file prior to your first commit: $ git rm –cached filename Thanks to Sean Chambers for tweeting about this   Some … Continue reading 

Posted in git | 11 Comments