Git

Show local commits with Git-Svn

Jul 10, 2013

On my current project we are using git-svn as the version control system. If you haven’t heard of git-svn, it’s a bi-directional ‘bridge’ that enables native Git repositories to interact with a Subversion respository. Basically your local repository will look and act like a normal Git repository (except for a few differences) and simply push to a remote Subversion repository.

Read More →

See which commit deleted a file with Git

Jul 9, 2013

Today I had one of those ‘Hey – where’d that file go’ moments. Turns out it’s pretty easy to find the commit that removed a file a with Git.

Read More →

What’s in a Good Commit?

Jul 8, 2013

The post is in response to a post by the same name which I read this weekend. While I agree with many of the points the author made there are a few areas where our opinions differ. I’m going to go through the different points the article makes and discuss each in turn.

Read More →

How to Create a Patch with Git

May 13, 2013

Today I needed to transfer a few commits from my pair’s laptop to my own. Since git is a distributed source control system you can actually pull commits directly from any git repo (including someone’s local repo) – as you would from GitHub. Unfortunately this requires SSH access which we didn’t have on the (corporate) network we were on. I really wanted something simpler – I wanted to create a patch.

Read More →

Amend Multiple Commit Messages with Git

May 10, 2013

Today my pair and I were about to push multiple commits when I realized we had forgotten to add the story number to all of the commit messages. Basically when I was looking at my git log:

Read More →

Using Git bisect

Nov 15, 2012

Once in a while it happens that I want to find the commit that introduced a bug. For example, today it happened that one of our integration testing suites was broken, but I didn’t quite know which commit was the culprit.

Read More →

Squashing the wrong commit in git

Nov 6, 2012

I tend to do temporary commits in git pretty often. This can be for a number of reasons – either to just get a stopping point, or to push my changes on to a remote branch for some reason.

Read More →