Merge branch 'js/commit-format'

* js/commit-format:
  show_date(): rename the "relative" parameter to "mode"
  Actually make print_wrapped_text() useful
  pretty-formats: add 'format:<string>'

diff --cc cache.h
Simple merge

diff --cc commit.c
Simple merge

diff --cc commit.h
Simple merge