I started a tumblog on Tumblr and I do not plan on continuing this blog.
February 7, 2009
July 13, 2008
June 13, 2008
A friend asked me about an error he had while trying ‘git pull, it was saying that file X was not uptodate.
For git pull (actually for merge) you need to not have anything uncommited (either commit or reset). But he did not wanted to commit because he didn’t finished working neither reset because he would lose his work.
There is another way, git stash: Git stash saves your modifications away and gives you a clean working dir. Use ‘git stash <optional name>‘ to create a stash. With ‘git stash list‘ you can view your stashes, ‘git stash show <name>‘ to view a specific stash and ‘git stash apply <name>‘ to apply it.
In his case he needed to run:
git stash work git pull git apply work
June 11, 2008
I haven’t written for a long time here. I was very busy with school and the InfoMatrix competition, where I won Silver medal with my ruby continuous integration service, more about it in a short while.
I am working more and more with Ruby, Rails professionally and trying out Merb, Datamapper, Amazon Web Services for personal project. I will try and post here from time to time my experiences with Ruby and other things I am using.
If you have anything that you would like me to write about please say. Also if you want to test my continuous integration (it’s kind of alpha) then please contact me.
May 3, 2008
I have previously posted how to compile git on Ubuntu but while using git I wanted to consulte the manual to get information about some commands and git help didn’t work. It seems that you have to manually specify when compiling that you want to have documentation included too.
Here’s how to do that. Go to the directory where you have unarchived git sources and type:
make doc sudo make install-doc
You can also combine them when you compile git:
make all doc sudo make install install-doc