automatically track remote branch when push
disable fast forward when merge
grep shows line number
rebase when pull
use keychain to get password