Factor out current branch logic
Add rbt (rebase theirs)
Change current to cb (current branch)
Change ds to `diff --stat`
Revert ds (diff --staged); add di, dsi