Merge branch 'jk/warn-author-committer-after-commit'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:40:12 +0000 (14:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:40:12 +0000 (14:40 -0800)
commit0877510ad4e8b951b08f9cbb25cfc0d994468979
treedcfc43b1cf44ba49c3f9f206504d2f1cfee8bcc6
parent15a873d6e85d8089117a6a2141c8158bd370cf49
parent1a893064d7b403625896a2c8bdab39f0f7db61d5
Merge branch 'jk/warn-author-committer-after-commit'

* jk/warn-author-committer-after-commit:
  user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
  commit.c::print_summary: do not release the format string too early
  commit: allow suppression of implicit identity advice
  commit: show interesting ident information in summary
  strbuf: add strbuf_addbuf_percentquote
  strbuf_expand: convert "%%" to "%"

Conflicts:
builtin-commit.c
ident.c
Documentation/config.txt
builtin-commit.c
daemon.c
strbuf.c
strbuf.h
t/t7501-commit.sh