@{upstream} -> $remote/$branch
rm rarely used git alias
add fish_prompt