diff options
Diffstat (limited to 'git-pull-script')
-rwxr-xr-x | git-pull-script | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/git-pull-script b/git-pull-script deleted file mode 100755 index fc463260bd..0000000000 --- a/git-pull-script +++ /dev/null @@ -1,12 +0,0 @@ -#!/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" |