summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-20 02:57:26 -0700
committerJunio C Hamano <junkio@cox.net>2005-08-24 16:50:50 -0700
commite0bfc81e05e57679916ab070c8fb2525f24771d4 (patch)
tree8c986688f21d71abcb232e5bd9c638cbee39bc3d /Makefile
parent853a3697dc2bc609650c38ed03a1f8fa9f145f97 (diff)
downloadgit-e0bfc81e05e57679916ab070c8fb2525f24771d4.tar.gz
[PATCH] Retire git-parse-remote.
Update git-pull to match updated git-fetch and allow pull to fetch from multiple remote references. There is no support for resolving more than two heads, which will be done with "git octopus". Update "git ls-remote" to use git-parse-remote-script. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 752affe407..267de67fd7 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
git-reset-script git-add-script git-checkout-script git-clone-script \
gitk git-cherry git-rebase-script git-relink-script git-repack-script \
git-format-patch-script git-sh-setup-script git-push-script \
- git-branch-script git-parse-remote git-parse-remote-script git-verify-tag-script \
+ git-branch-script git-parse-remote-script git-verify-tag-script \
git-ls-remote-script git-clone-dumb-http git-rename-script \
git-request-pull-script git-bisect-script