Git tips from the trenches