Fix dcommit, rebase when rewriteRoot is in use