Merge branch 'jc/ident'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:39:52 +0000 (14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:39:52 +0000 (14:39 -0800)
* jc/ident:
  ident.c: replace fprintf with fputs to suppress compiler warning
  user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
  ident.c: treat $EMAIL as giving user.email identity explicitly
  ident.c: check explicit identity for name and email separately
  ident.c: remove unused variables

1  2 
builtin-commit.c
cache.h
config.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge