diff options
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/git-pull-script b/git-pull-script new file mode 100755 index 0000000000..fc463260bd --- /dev/null +++ b/git-pull-script @@ -0,0 +1,12 @@ +#!/bin/sh +# +. git-sh-setup-script || die "Not a git archive" +. git-parse-remote "$@" +merge_name="$_remote_name" + +git-fetch-script "$@" || exit 1 + +git-resolve-script \ + "$(cat "$GIT_DIR"/HEAD)" \ + "$(cat "$GIT_DIR"/FETCH_HEAD)" \ + "Merge $merge_name" |