Merge branch 'sb/committer' into next
commit5c19ee944fba02bb902010663ac2ac61cb9fbdab
authorJunio C Hamano <gitster@pobox.com>
Sun, 11 May 2008 21:56:27 +0000 (11 14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 11 May 2008 21:56:27 +0000 (11 14:56 -0700)
treebf4db7913b7c824eb09316b428cecbdd31dfa196
parenteaf761ecfb9857df22e4c3a1d9014d9f3964dc02
parentbb1ae3f6fff19b0a1ab1bb6a815d26d39b9f15e6
Merge branch 'sb/committer' into next

* 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