1 files changed, 0 insertions, 44 deletions
diff --git a/git-pull-script b/git-pull-script
deleted file mode 100755
index c31a65ca8c..0000000000
--- a/git-pull-script
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Junio C Hamano
-#
-# Fetch one or more remote refs and merge it/them into the current HEAD.
-
-. git-sh-setup-script || die "Not a git archive"
-
-orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
-git-fetch-script --update-head-ok "$@" || exit 1
-
-curr_head=$(cat "$GIT_DIR/HEAD")
-if test "$curr_head" != "$orig_head"
-then
-	# The fetch involved updating the current branch.
-
-	# The working tree and the index file is still based on the
-	# $orig_head commit, but we are merging into $curr_head.
-	# First update the working tree to match $curr_head.
-
-	echo >&2 "Warning: fetch updated the current branch head."
-	echo >&2 "Warning: fast forwarding your working tree."
-	git-read-tree -u -m "$orig_head" "$curr_head" ||
-		die "You need to first update your working tree."
-fi
-
-merge_head=$(sed -e 's/	.*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
-merge_name=$(sed -e 's/^[0-9a-f]*	//' "$GIT_DIR"/FETCH_HEAD |
-	 tr '\012' ' ')
-
-case "$merge_head" in
-'')
-	echo >&2 "No changes."
-	exit 0
-	;;
-*' '?*)
-	echo >&2 "Pulling more than one heads; making an Octopus."
-	exec git-octopus-script
-	;;
-esac
-
-git-resolve-script \
-	"$(cat "$GIT_DIR"/HEAD)" \
-	$merge_head "Merge $merge_name"