Merge branch 'master'

* master:
rev-list: default to abbreviate merge parent names under --pretty.
delta micro optimization
count-delta.c: comment fixes
Merge branch 'jc/empty-commit'