Technical information on this site may be out of date : no updates since 2015

Blocking git commits from future merges

August 15, 2013 , posted under svn git version control

I used to use subversion and svnmerge a lot, and there’s just one thing I miss about it. Now svnmerge is a tool to bolt on merge tracking to svn, and gits merge tracking is vastly better in many ways. But the one thing that svnmerge allowed me to do that was cool and doesn’t have a real equivalent in git is to block commits

Read More…

git files with local changes I don't want committed

March 25, 2013 , posted under git

I’m working on a project where I find I want to semi-regularly adjust a config file for local testing, but want to be sure I don’t commit that file by mistake.

Seems the best approach is

git update-index --skip-worktree $filename

This tells git to skip this file when I push, if the remote file changes it will warn me

Read More…

Reinstall grub after windows breaks it

February 12, 2013 , posted under linux windows grub

One of those things that happens from time to time on a dual boot system…

Windows breaks grub, usually if I’ve reinstalled windows, this can lead to a unbootable system.

Boot from a Ubuntu (or other distro) live disk or USB stick.

Read More…