1#!/bin/sh
2#
3merge_repo=$1
45
merge_name=$(echo "$1" | sed 's:\.git/*$::')
6merge_head=HEAD
7if [ "$2" ]
8then
9merge_name="'$2' branch from
1011
$merge_name"
12merge_head="refs/heads/$2"
13fi
1415
: ${GIT_DIR=.git}
16: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
1718
git-fetch-script "$merge_repo" "$merge_head"
1920
git-resolve-script \
21"$(cat "$GIT_DIR"/HEAD)" \
22"$(cat "$GIT_DIR"/MERGE_HEAD)" \
23"$merge_name"