OS X

Ubuntu

If using a recent Ubuntu relase (9.04, 9.10 or later), you can install git from the main repository:

$ apt-get install git-core

Using recent git

However, if you either want to use the latest git version or use an older Ubuntu release, you can use ​the personal package archive that provides backports of the recent git version for all Ubuntu releases since Hardy.

Installation instructions:

add the following line to /etc/apt/sources.list.d/git.list (substituting UBUNTU_RELEASE_NAME with the Ubuntu release you are using):

If the patch needs updating, create a new patch and attach it to the relevant ticket

git diff master > ticket1234.patch

Repeat for every ticket you have worked on.

Testing everything in the has-it-all branch

Goal: a place to try out the code from several tasks together. master can not be used for this as it is used for tracking upstream. This is a temporary branch that can be removed after testing is done.

Create the branch

git checkout -b has-it-all master

Merge in all task branches, fix any conflicts that occur in the task branches (i.e. they should merge cleanly)