Merge with master.
[git] / git-pull-script
1 #!/bin/sh
2 #
3 . git-sh-setup-script || die "Not a git archive"
4 . git-parse-remote "$@"
5 merge_name="$_remote_name"
6
7 git-fetch-script "$@" || exit 1
8
9 git-resolve-script \
10         "$(cat "$GIT_DIR"/HEAD)" \
11         "$(cat "$GIT_DIR"/FETCH_HEAD)" \
12         "Merge $merge_name"