Good article on how I'm probably doing git wrong!