| #!/bin/sh | |
| # | |
| # use "$1" or something in a real script, this | |
| # just hard-codes it. | |
| # | |
| merge_repo=$1 | |
| merge_name=${2:-HEAD} | |
| echo "Getting object database" | |
| rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/. | |
| echo "Getting remote $merge_name" | |
| rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1 | |
| git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo" |