summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-07 23:15:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-07 23:15:32 (GMT)
commit81b4f18fb8f9356477157a3b9f0652d371cba835 (patch)
tree43c7f1ff37f8c9dabc1946325edeaedd1b9a6832 /Makefile
parent416fda6917f05b456ae263cb7152892bdf96f47c (diff)
parent709a957d9493cbdd457d02bfada067c9b3ccc253 (diff)
downloadgit-81b4f18fb8f9356477157a3b9f0652d371cba835.zip
git-81b4f18fb8f9356477157a3b9f0652d371cba835.tar.gz
git-81b4f18fb8f9356477157a3b9f0652d371cba835.tar.bz2
Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
* js/transport-helper-error-reporting-fix: git-remote-testgit: build it to run under $SHELL_PATH git-remote-testgit: further remove some bashisms git-remote-testgit: avoid process substitution t5801: "VAR=VAL shell_func args" is forbidden transport-helper: update remote helper namespace transport-helper: trivial code shuffle transport-helper: warn when refspec is not used transport-helper: clarify pushing without refspecs transport-helper: update refspec documentation transport-helper: clarify *:* refspec transport-helper: improve push messages transport-helper: mention helper name when it dies transport-helper: report errors properly Conflicts: t/t5801-remote-helpers.sh
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ff0f527..e9ac122 100644
--- a/Makefile
+++ b/Makefile
@@ -460,6 +460,7 @@ SCRIPT_SH += git-mergetool.sh
SCRIPT_SH += git-pull.sh
SCRIPT_SH += git-quiltimport.sh
SCRIPT_SH += git-rebase.sh
+SCRIPT_SH += git-remote-testgit.sh
SCRIPT_SH += git-repack.sh
SCRIPT_SH += git-request-pull.sh
SCRIPT_SH += git-stash.sh