Git jail / fixes on 'switch to branch'