Code

Merge branch 'wp/pretty-enhancement'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:00 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:00 +0000 (11:21 -0700)
* 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

1  2 
Documentation/config.txt
Documentation/pretty-formats.txt
pretty.c

Simple merge
Simple merge
diff --cc pretty.c
Simple merge