Using git without feeling stupid (part 2)