emacs -> fixed shell, gitconfig -> no pager
Merge remote-tracking branch 'origin/master'