projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Install git-verify-tag-script
[git.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index
0585df6
..
fc46326
100755
(executable)
--- a/
git-pull-script
+++ b/
git-pull-script
@@
-1,14
+1,12
@@
#!/bin/sh
#
#!/bin/sh
#
-merge_repo=$1
-merge_name=${2:-HEAD}
+. git-sh-setup-script || die "Not a git archive"
+. git-parse-remote "$@"
+merge_name="$_remote_name"
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
-git-fetch-script "$merge_repo" "$merge_name"
+git-fetch-script "$@" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
- "$(cat "$GIT_DIR"/
MERGE
_HEAD)" \
- "
$merge_repo
"
+ "$(cat "$GIT_DIR"/
FETCH
_HEAD)" \
+ "
Merge $merge_name
"