Archive for the 'git' Category

Recovering from a botched git rebase

Monday, November 12th, 2012

In my two-phase source control architecture (in short, git repos for local source control, and a shared Perforce repo for team-accessible source control) I’ve had many (many, many) very, very bad experiences with git rebase. Here’s what typically happens: I’m happily working away on my topic branch and get pretty far behind the Perforce HEAD. […]

Git template directory on Windows

Sunday, January 16th, 2011

I just spent entirely too much time trying to find the git-init template directory on my Windows machine (so I could copy my default hooks from one machine to another). In order to save this hard-won information to non-volatile memory (i.e. the Internets), here it is (at least for windows 7): C:\Program Files\Git\share\git-core\templates – on […]