Andrew's git - gitweb.git/blob

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