Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3merge_repo=$1
   4
   5merge_name=$(echo "$1" | sed 's:\.git/*$::')
   6merge_head=HEAD
   7if [ "$2" ]
   8then
   9   merge_name="'$2' branch of $merge_name"
  10   merge_head="refs/heads/$2"
  11fi
  12
  13: ${GIT_DIR=.git}
  14: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
  15
  16git-fetch-script "$merge_repo" "$merge_head" || exit 1
  17
  18git-resolve-script \
  19        "$(cat "$GIT_DIR"/HEAD)" \
  20        "$(cat "$GIT_DIR"/MERGE_HEAD)" \
  21        "$merge_name"