blob: 8e309fc98b97659d08061b0e1f1e6d4f1e43fc32 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
#!/bin/sh
#
. git-sh-setup-script || die "Not a git archive"
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-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/FETCH_HEAD)" \
"Merge $merge_name"
|
