Merge branch 'jc/author-nickname'

* jc/author-nickname:
git commit --author=$name: look $name up in existing commits

diff --cc builtin-commit.c
Simple merge