Merge branch 'jn/fix-abbrev'

* jn/fix-abbrev:
examples/commit: use --abbrev for commit summary
checkout, commit: remove confusing assignments to rev.abbrev
archive: abbreviate substituted commit ids again

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/commit.c
Simple merge