Andrew's git / gitweb.git / git-pull-script
?
git-pull-scripton commit [PATCH] Make sq_expand() available as sq_quote(). (6fb737b)
   1#!/bin/sh
   2#
   3. git-sh-setup-script || die "Not a git archive"
   4
   5merge_repo=$1
   6
   7merge_name=$(echo "$1" | sed 's:\.git/*$::')
   8merge_head=HEAD
   9type=head
  10if [ "$2" = "tag" ]; then
  11   type=tag
  12   shift
  13fi
  14if [ "$2" ]
  15then
  16   merge_name="$type '$2' of $merge_name"
  17   merge_head="refs/${type}s/$2"
  18fi
  19
  20git-fetch-script "$merge_repo" "$merge_head" || exit 1
  21
  22git-resolve-script \
  23        "$(cat "$GIT_DIR"/HEAD)" \
  24        "$(cat "$GIT_DIR"/FETCH_HEAD)" \
  25        "$merge_name"