Backport git-rebase git-status race condition fix