Merge branch 'wp/pretty-enhancement' into next
commiteeaa4dc9b9a244b55e42b7a5b4436f67b967f2eb
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 22:28:16 +0000 (9 15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 22:28:16 +0000 (9 15:28 -0700)
treeb83560ad1769358a622dc7b9db6bb4a00c46ec28
parentefd1311e282a5b9e6ddee918cd82f39fed6ce1c4
parent95a2618f60a61fae8097695255419f257f74dff9
Merge branch 'wp/pretty-enhancement' into next

* 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