Update hacking for proper rebase technique.