Accounting for special case in git