Add git-info diverged subcontext for prompt formatting
zpreztorc setup
mafro theme
fixup! df260e92c46671bd937ea9c97b2f5c84bb9cc460
fixup! 97d7d4157addce27305e9bfc43ea54fda3cff4d3
git-info: don't show dirty when unmerged
git-info: show action in place of branch name, or commit during rebase