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

#!/bin/sh
#
merge_repo=$1
merge_name=${2:-HEAD}

: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}

git-fetch-script "$merge_repo" "$merge_name"

git-resolve-script \
	"$(cat "$GIT_DIR"/HEAD)" \
	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
	"$merge_repo"
Commit	Line	Data
839a7a06 LT	1	#!/bin/sh
839a7a06 LT	2	#
839a7a06	3	merge_repo=$1
552e2bd1	4	merge_name=${2:-HEAD}
839a7a06	5
8ac069ac JH	6	: ${GIT_DIR=.git}
	7	: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
	8
7ef76925	9	git-fetch-script "$merge_repo" "$merge_name"
839a7a06	10
8ac069ac JH	11	git-resolve-script \
	12	"$(cat "$GIT_DIR"/HEAD)" \
	13	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
	14	"$merge_repo"