]>
Commit | Line | Data |
---|---|---|
839a7a06 LT |
1 | #!/bin/sh |
2 | # | |
b33e9666 | 3 | . git-sh-setup-script || die "Not a git archive" |
f170e4b3 JH |
4 | . git-parse-remote "$@" |
5 | merge_name="$_remote_name" | |
b33e9666 | 6 | |
f170e4b3 | 7 | git-fetch-script "$@" || exit 1 |
839a7a06 | 8 | |
8ac069ac JH |
9 | git-resolve-script \ |
10 | "$(cat "$GIT_DIR"/HEAD)" \ | |
6b38a402 | 11 | "$(cat "$GIT_DIR"/FETCH_HEAD)" \ |
3ba513c3 | 12 | "Merge $merge_name" |