iamcal.com

Git roundup

This is one of the best pieces of technical writing I've seen - an implementation of (some of) Git in JavaScript, with a very well written inline description of what's going on.

On a slightly nerdier bent, this explanation of the packfile format is pretty great too.

Closing Some Tabs

I'm closing out some 2014 tabs, so have a few useful links.

Want to make a game, but don't know how to get started? Sortingh.at is a great step-by-step resource.

Using Google Apps-for-business and group mail is bouncing? Follow these instructions to switch to "proper" groups.

Think you can recognize your developers from their commit messages? git-game turns it into a neat game where you try to figure out whose entire message was just "fuck" the most often.

Want a machine that make tortillas at the press of a button? I DO. flatev is the answer.

Git rebase forever

Every time I get the message "To prevent you from losing history, non-fast-forward updates were rejected" I have forgetten how to fix it (in the normal case). Yet another guide to simple rebasing in git. This shit is way too complicated.

Deploying at GitHub

I've been meaning to link to this for a while: Deploying at GitHub explains the develop/stage/deploy cycle at github, which can rougly be described as "Like Flickr, but with personal dev environments and using Git". It's light on technical details, but says a lot of the right things.

Git up

git-up seems to be the Git tool I had been missing - fetch, stash, rebase, unstash for all branches.

27th November, 2:41 am

there are plenty of tips for removing files from a git repo history, but this method of just replacing the string is waaay better

23rd November, 9:51 pm

a simple guide to undoing operations in git

23rd March, 6:43 am

best pull request evar. oh yes

27th August, 6:18 pm

git submodules are like svn externals, but with the added benefit of being almost impossible to remove