git.oblomov.eu Git - git/blob - git-pull-script

   1 #!/bin/sh
   2 #
   3 # use "$1" or something in a real script, this
   4 # just hard-codes it.
   5 #
   6 merge_repo=$1
   7 merge_name=${2:-HEAD}
   8
   9 echo "Getting object database"
  10 rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
  11
  12 echo "Getting remote $merge_name"
  13 rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
  14
  15 git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"