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
git-apply: parse the diff headers (both traditional and new)
[git.git]
/
git-pull-script
blob
0585df61e241b302cf007cd75dd6e9fd3b78596a
1
#!/bin/sh
2
#
3
merge_repo
=
$1
4
merge_name
=
${2:-HEAD}
5
6
:
${GIT_DIR=.git}
7
:
${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
8
9
git-fetch-script
"
$merge_repo
"
"
$merge_name
"
10
11
git-resolve-script \
12
"$(cat "
$GIT_DIR
"/HEAD)"
\
13
"$(cat "
$GIT_DIR
"/MERGE_HEAD)"
\
14
"
$merge_repo
"