Merge branch 'wp/pretty-enhancement'
commitce987457ca3db0c78d5e720f753adf210fd3dd65
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:00 +0000 (13 11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:00 +0000 (13 11:21 -0700)
tree046f8a309909cda113775f81e0d4bb08f2b1f658
parenta9f80f3dd4dc68ec6e9898805ccac2bb44c563ab
parent95a2618f60a61fae8097695255419f257f74dff9
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
Documentation/config.txt
Documentation/pretty-formats.txt
pretty.c