Andrew's git / gitweb.git / git-pull-script
?
git-pull-scripton commit diff.c: don't silently ignore unknown state changes in diffs. (6f93a63)
   1#!/bin/sh
   2#
   3merge_repo=$1
   4merge_name=${2:-HEAD}
   5
   6: ${GIT_DIR=.git}
   7: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
   8
   9git-fetch-script "$merge_repo" "$merge_name"
  10
  11git-resolve-script \
  12        "$(cat "$GIT_DIR"/HEAD)" \
  13        "$(cat "$GIT_DIR"/MERGE_HEAD)" \
  14        "$merge_repo"