Merge branch 'el/blame-date'

* el/blame-date:
  Make git blame's date output format configurable, like git log

diff --cc Documentation/blame-options.txt
Simple merge

diff --cc builtin-blame.c
Simple merge