add alias for branch-commits script
move --prune to fa and remove fap
add aliases for diff file names
update fix and wip aliases
add merge alias
add branch info to short status
add stash aliases
update zshrc
update tmux conf