summaryrefslogtreecommitdiff
path: root/git-octopus.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-octopus.sh')
-rwxr-xr-xgit-octopus.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-octopus.sh b/git-octopus.sh
index abc6820..d2471af 100755
--- a/git-octopus.sh
+++ b/git-octopus.sh
@@ -86,5 +86,5 @@ esac
result_commit=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD" |
git-commit-tree $MRT $PARENT)
echo "Committed merge $result_commit"
-echo $result_commit >"$GIT_DIR"/HEAD
+git-update-ref HEAD $result_commit $head
git-diff-tree -p $head $result_commit | git-apply --stat