4 if [ -f $GIT_DIR/MERGE_HEAD ]; then
6 echo "# It looks like your may be committing a MERGE."
7 echo "# If this is not correct, please remove the file"
8 echo "# $GIT_DIR/MERGE_HEAD"
11 PARENTS="HEAD -p MERGE_HEAD"
13 git-status-script >> .editmsg
19 ${VISUAL:-${EDITOR:-vi}} .editmsg
20 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
21 [ -s .cmitmsg ] || exit 1
22 tree=$(git-write-tree) || exit 1
23 commit=$(cat .cmitmsg | git-commit-tree $tree -p $PARENTS) || exit 1
24 echo $commit > ${GIT_DIR:-.git}/HEAD