Andrew's git / gitweb.git / git-pull-script
?
git-pull-scripton commit Be more careful about tree entry modes. (42ea9cb)
   1#!/bin/sh
   2#
   3# use "$1" or something in a real script, this 
   4# just hard-codes it.
   5#
   6merge_repo=$1
   7merge_name=${2:-HEAD}
   8
   9echo "Getting object database"
  10rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
  11
  12echo "Getting remote $merge_name"
  13rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
  14
  15git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"