diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-15 00:52:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 00:52:20 -0700 |
| commit | 64c6f100c4956d8a3543ef99a14a96f67e13096f (patch) | |
| tree | 0a6d00d85b7a538d734371c4cda11217e80a7906 /Makefile | |
| parent | Merge branch 'lt/oneway' into next (diff) | |
| parent | apply --numstat: show new name, not old name. (diff) | |
| download | tgif-64c6f100c4956d8a3543ef99a14a96f67e13096f.tar.xz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -131,7 +131,8 @@ SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \ git-annotate.perl git-cvsserver.perl \ - git-svnimport.perl git-mv.perl git-cvsexportcommit.perl + git-svnimport.perl git-mv.perl git-cvsexportcommit.perl \ + git-send-email.perl SCRIPT_PYTHON = \ git-merge-recursive.py @@ -320,10 +321,6 @@ else endif endif -ifdef WITH_SEND_EMAIL - SCRIPT_PERL += git-send-email.perl -endif - ifndef NO_CURL ifdef CURLDIR # This is still problematic -- gcc does not always want -R. |