diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-26 22:47:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-26 22:47:27 -0700 |
| commit | 0f583175317a1c5c57b56c87856fbe46c3f3c296 (patch) | |
| tree | 743751d750cb7355c02dd2aa7f53a655ba6fd11c /Makefile | |
| parent | b033b4e48195ef5974b7255f30de2cd7f67868b8 (diff) | |
| parent | aba2da13391d2adc72c0a2805e7196db2c803753 (diff) | |
| download | git-0f583175317a1c5c57b56c87856fbe46c3f3c296.tar.gz | |
Merge master branch changes into release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -69,7 +69,6 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \ git-request-pull-script git-bisect-script SCRIPTS += git-count-objects-script -# SCRIPTS += git-send-email-script SCRIPTS += git-revert-script SCRIPTS += git-octopus-script @@ -87,6 +86,10 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-show-index git-daemon git-var git-peek-remote git-show-branch \ git-update-server-info git-show-rev-cache git-build-rev-cache +ifdef WITH_SEND_EMAIL +SCRIPTS += git-send-email-script +endif + ifndef NO_CURL PROG+= git-http-pull endif |