add git aliases and set branch autosetupmerge to true
tmux config changes