Merge branch 'wp/pretty-enhancement'

* wp/pretty-enhancement:
  pretty: initialize new cmt_fmt_map to 0
  pretty: add aliases for pretty formats
  pretty: add infrastructure for commit format aliases
  pretty: make it easier to add new formats

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/pretty-formats.txt
Simple merge

diff --cc pretty.c
Simple merge