rebase with git ignore