add actionformats to zsh (nice rebasing/merging)