git-pull-script


1
2
3
4
5
6
7
8
9
10
11
12
13
14

#!/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"