Merge branch 'sb/committer'
commitb66ae7955ca10cf4f59130c9a63b327e4d9df104
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 20:45:20 +0000 (14 13:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 20:45:20 +0000 (14 13:45 -0700)
tree89b6d915cf08c4cccfdb1485c6da3482094f5d4b
parent761adeb4dba3305d0810b5340a71783d29484fb0
parentbb1ae3f6fff19b0a1ab1bb6a815d26d39b9f15e6
Merge branch 'sb/committer'

* sb/committer:
  commit: Show committer if automatic
  commit: Show author if different from committer
  Preparation to call determine_author_info from prepare_to_commit
builtin-commit.c
cache.h
config.c
environment.c