Merge branch 'ot/pretty'

Code clean-up.

* ot/pretty:
format: create docs for pretty.h
format: create pretty.h file

diff --cc builtin/notes.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc builtin/show-branch.c
Simple merge