| Linus Torvalds | 839a7a0 | 2005-04-18 12:15:10 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| Linus Torvalds | b33e966 | 2005-07-08 10:57:21 -0700 | [diff] [blame] | 3 | . git-sh-setup-script || die "Not a git archive" |
| Junio C Hamano | f170e4b | 2005-07-16 00:16:24 -0700 | [diff] [blame] | 4 | . git-parse-remote "$@" |
| 5 | merge_name="$_remote_name" |
| Linus Torvalds | b33e966 | 2005-07-08 10:57:21 -0700 | [diff] [blame] | 6 | |
| Junio C Hamano | f170e4b | 2005-07-16 00:16:24 -0700 | [diff] [blame] | 7 | git-fetch-script "$@" || exit 1 |
| Linus Torvalds | 839a7a0 | 2005-04-18 12:15:10 -0700 | [diff] [blame] | 8 | |
| Junio C Hamano | 8ac069a | 2005-05-09 22:57:58 -0700 | [diff] [blame] | 9 | git-resolve-script \ |
| 10 | "$(cat "$GIT_DIR"/HEAD)" \ |
| Linus Torvalds | 6b38a40 | 2005-06-21 14:04:13 -0700 | [diff] [blame] | 11 | "$(cat "$GIT_DIR"/FETCH_HEAD)" \ |
| Linus Torvalds | 3ba513c | 2005-07-08 17:38:44 -0700 | [diff] [blame] | 12 | "Merge $merge_name" |
