Add tool for rebasing files

This will make cherry-picking fail less