Git: use @{upstream} instead ORIG_HEAD

- prefer @ notation and
- it's what intentded
Git: use tformat instead just format

- format adds \n BETWEEN commits
- tformat adds \n after each commit (thuse after the last one aswell)
Merge github.com:gmarik/dotfiles