Andrew's git / gitweb.git /
a4ca97c64566419a0dc02e8e719333d1c9240edc
   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 from
  10
  11        $merge_name"
  12   merge_head="refs/heads/$2"
  13fi
  14
  15: ${GIT_DIR=.git}
  16: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
  17
  18git-fetch-script "$merge_repo" "$merge_head" || exit 1
  19
  20git-resolve-script \
  21        "$(cat "$GIT_DIR"/HEAD)" \
  22        "$(cat "$GIT_DIR"/MERGE_HEAD)" \
  23        "$merge_name"