repo.or.cz
/
git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
daemon.c: squelch error message from EINTR
[git.git]
/
git-pull-script
blob
fc463260bd9dd07e50494e7cbb39ef6833179ff3
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
"