Merge branch 'jc/gg' into pupu
commit26552a32e64ebcc22e7ff4e8162b21275892980d
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:43:11 +0000 (11 17:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:43:11 +0000 (11 17:43 -0700)
treee6466dca2297586dc987e8805de839b3338ef636
parent394f0a022e5623921b6706da61f5198f4077753e
parent41b689c3cbf6a0cb5e03c1fc4ce4338b9784893b
Merge branch 'jc/gg' into pu

* jc/gg:
  commit: add get_commit_encoding()
  commit: rename parse_commit_date()
  commit: shrink "indegree" field

Conflicts:
pretty.c
commit.h
pretty.c
sequencer.c