[PATCH] Allow dot files in ls-files as well (take #2).
[git/haiku.git] / git-pull-script
blob0585df61e241b302cf007cd75dd6e9fd3b78596a
1 #!/bin/sh
3 merge_repo=$1
4 merge_name=${2:-HEAD}
6 : ${GIT_DIR=.git}
7 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
9 git-fetch-script "$merge_repo" "$merge_name"
11 git-resolve-script \
12 "$(cat "$GIT_DIR"/HEAD)" \
13 "$(cat "$GIT_DIR"/MERGE_HEAD)" \
14 "$merge_repo"