summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-09 17:22:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-09 17:22:23 (GMT)
commitedee414c3e5a546aae3dd1529f397df949713305 (patch)
tree665e1e695501289a63272c3de89aed3eb555ed74 /Makefile
parentc3958a7926ab20b90fe0767580b466698477f5b6 (diff)
parentf10e0e0b18c8e2e69535e7380fb3c1f9b097cfda (diff)
downloadgit-edee414c3e5a546aae3dd1529f397df949713305.zip
git-edee414c3e5a546aae3dd1529f397df949713305.tar.gz
git-edee414c3e5a546aae3dd1529f397df949713305.tar.bz2
Merge with master.
This merges commit f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda from master into our head commit c3958a7926ab20b90fe0767580b466698477f5b6 Sincerely, jit-merge command.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e574f44..df5f8c0 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ 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-send-email-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \