Rearrange some git guidelines