[thirdparty/git.git] / git-pull-script

#!/bin/sh
#
. git-sh-setup-script || die "Not a git archive"
. git-parse-remote "$@"
merge_name="$_remote_name"

git-fetch-script "$@" || exit 1

git-resolve-script \
	"$(cat "$GIT_DIR"/HEAD)" \
	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
	"Merge $merge_name"
Commit	Line	Data
839a7a06 LT	1	#!/bin/sh
839a7a06 LT	2	#
b33e9666	3	. git-sh-setup-script \|\| die "Not a git archive"
f170e4b3 JH	4	. git-parse-remote "$@"
f170e4b3 JH	5	merge_name="$_remote_name"
b33e9666	6
f170e4b3	7	git-fetch-script "$@" \|\| exit 1
839a7a06	8
8ac069ac JH	9	git-resolve-script \
8ac069ac JH	10	"$(cat "$GIT_DIR"/HEAD)" \
6b38a402	11	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
3ba513c3	12	"Merge $merge_name"