summaryrefslogtreecommitdiff
path: root/git-pull-script
blob: fc463260bd9dd07e50494e7cbb39ef6833179ff3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
#!/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"