mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
26 lines
487 B
Bash
Executable file
26 lines
487 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
merge_repo=$1
|
|
|
|
merge_name=$(echo "$1" | sed 's:\.git/*$::')
|
|
merge_head=HEAD
|
|
type=head
|
|
if [ "$2" = "tag" ]; then
|
|
type=tag
|
|
shift
|
|
fi
|
|
if [ "$2" ]
|
|
then
|
|
merge_name="$type '$2' of $merge_name"
|
|
merge_head="refs/${type}s/$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"/FETCH_HEAD)" \
|
|
"$merge_name"
|