Sign in
code
/
git
/
v0.99.3
/
.
/
git-pull-script
blob: fc463260bd9dd07e50494e7cbb39ef6833179ff3 [
file
] [
log
] [
blame
]
#!/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"
