add git ff alias
use uxterm as default terminal emulator
add "git branch" shortcut