Merge branch 'jc/apply' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 07:52:20 +0000 (00:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 07:52:20 +0000 (00:52 -0700)
commit64c6f100c4956d8a3543ef99a14a96f67e13096f
tree0a6d00d85b7a538d734371c4cda11217e80a7906
parente8efc9036fd7b793e84af4165fea715794924794
parent49e3343c9fe0e134e0a8c1ec0ddeb64ae18ee9fd
Merge branch 'jc/apply' into next

* jc/apply:
  apply --numstat: show new name, not old name.
  Ensure author & committer before asking for commit message.
  Install git-send-email by default
  send-email: address expansion for common mailers
  diffstat rename squashing fix.
Makefile
apply.c
diff.c