Merge branch 'jc/terminator-separator'

* jc/terminator-separator:
  log: teach "terminator" vs "separator" mode to "--pretty=format"

diff --cc builtin-commit.c
Simple merge

diff --cc revision.c
Simple merge