mirror of
https://github.com/git/git.git
synced 2024-11-05 22:19:47 +01:00
24 lines
429 B
Bash
Executable File
24 lines
429 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
merge_repo=$1
|
|
|
|
merge_name=$(echo "$1" | sed 's:\.git/*$::')
|
|
merge_head=HEAD
|
|
if [ "$2" ]
|
|
then
|
|
merge_name="'$2' branch from
|
|
|
|
$merge_name"
|
|
merge_head="refs/heads/$2"
|
|
fi
|
|
|
|
: ${GIT_DIR=.git}
|
|
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
|
|
|
|
git-fetch-script "$merge_repo" "$merge_head" || exit 1
|
|
|
|
git-resolve-script \
|
|
"$(cat "$GIT_DIR"/HEAD)" \
|
|
"$(cat "$GIT_DIR"/MERGE_HEAD)" \
|
|
"$merge_name"
|