updateing rebasing fix, and diff aliases (master)