Better git behaviour