]>
Commit | Line | Data |
---|---|---|
839a7a06 LT |
1 | #!/bin/sh |
2 | # | |
b33e9666 LT |
3 | . git-sh-setup-script || die "Not a git archive" |
4 | ||
839a7a06 | 5 | merge_repo=$1 |
c5434dea LT |
6 | |
7 | merge_name=$(echo "$1" | sed 's:\.git/*$::') | |
8 | merge_head=HEAD | |
635f67f9 LT |
9 | type=head |
10 | if [ "$2" = "tag" ]; then | |
11 | type=tag | |
12 | shift | |
13 | fi | |
c5434dea LT |
14 | if [ "$2" ] |
15 | then | |
635f67f9 | 16 | merge_name="$type '$2' of $merge_name" |
5571be75 | 17 | merge_head="refs/${type}s/$2" |
c5434dea | 18 | fi |
839a7a06 | 19 | |
ed37b5b2 | 20 | git-fetch-script "$merge_repo" "$merge_head" || exit 1 |
839a7a06 | 21 | |
8ac069ac JH |
22 | git-resolve-script \ |
23 | "$(cat "$GIT_DIR"/HEAD)" \ | |
6b38a402 | 24 | "$(cat "$GIT_DIR"/FETCH_HEAD)" \ |
c5434dea | 25 | "$merge_name" |