A few git commands I find myself having to look up:
Resolve Git merge conflicts in favor of their changes during a pull:
git pull -Xtheirs
git checkout --theirs the/conflicted.file
Viewing Unpushed Git Commits
git log origin/master..HEAD
You can also view the diff using the same syntax:
git diff origin/master..HEAD
Or, “for a little extra awesomeness”
git log --stat origin/master..HEAD
Updated since it was first posted:
Starting with Git 2.5+ (Q2 2015), the actual answer would be git log @{push}… See that new shortcut @{push}
And:
Outgoing changes:
git log @{u}..Incoming changes:git log ..@{u}
@{u}or@{upstream}means the upstream branch of the current branch (seegit rev-parse --helporgit help revisionsfor details).