summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-23 19:40:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-23 19:40:03 (GMT)
commit4c9d7bc4a68e0c0608e865ccac69a517bc3f65b7 (patch)
treefccbf03d664f1edc0eed0fd0f5394891cbd841f3 /Makefile
parent29a03fa5625433e5fc90da2f823b4277960537ae (diff)
parent6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1 (diff)
downloadgit-4c9d7bc4a68e0c0608e865ccac69a517bc3f65b7.zip
git-4c9d7bc4a68e0c0608e865ccac69a517bc3f65b7.tar.gz
git-4c9d7bc4a68e0c0608e865ccac69a517bc3f65b7.tar.bz2
Merge branch 'pw/git-p4'
By Pete Wyckoff * pw/git-p4: git p4: use "git p4" directly in tests git p4: update name in script git-p4: move to toplevel
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index abee43e..28a46e5 100644
--- a/Makefile
+++ b/Makefile
@@ -440,6 +440,7 @@ SCRIPT_PERL += git-send-email.perl
SCRIPT_PERL += git-svn.perl
SCRIPT_PYTHON += git-remote-testgit.py
+SCRIPT_PYTHON += git-p4.py
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \