Updating local Git repository to most recent version

Tuesday, April 19, 2011 Posted by

So I use some software from a Git repository. The idea is simple, when the developers update it I simply have to update the local repository to the recent HEAD in the master branch and I have the up-to-date stuff to link against.

But how to do this?

$ git pull
Should do the trick when executed in the directory where the .git is located (find this with ls -lAh to show hidden files).

You may get an error like:

5764cf9..5d8cc2a master -> origin/master
Updating 5764cf9..5d8cc2a
error: Your local changes to '.oppbuildspec' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.

This can be easily fixed:
$ git stash save "updating to head from repo"
And now we can proceed with the git pull command.

References:
Thanks to http://ic3man5.wordpress.com/2010/04/07/git-update-working-copy-with-remote/

Syntax highlighting for elog files in Vim

Wednesday, April 13, 2011 Posted by

OMNeT++ can generate eventlogs. All really neat and such, but without proper syntax highlighting it is not very suitable for visual inspection. Read the rest of this entry »

Syntax highlighting for SCA files in Vim

Wednesday, April 13, 2011 Posted by

You may find yourself browsing through scalar output files of OMNeT++. A little syntaxhighlighting may be useful here. Read the rest of this entry »

Syntax highlighting for NED files in Vim

Wednesday, April 13, 2011 Posted by

If you want to edit OMNeT++ NED files in Vim, it may be nice to have some syntax highlighting. Read the rest of this entry »

Blackhawk Black Ops boots

Monday, April 11, 2011 Posted by

Looking for some light footwear for the summer – without sacrificing stability and protection, mind you – I came across the Black Ops boots by Blackhawk. Sturdy yet ultra lightweight. Plenty of good reviews on youtube. So I bought myself a pair. Read the rest of this entry »