X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-octopus.sh;h=d2471af3c8a002c175bf9b1370039b9e7d4ab946;hb=5f93926c3c5c4fe1def39de82076bc69ec89c058;hp=abc682025e5316e7d8612e5aa2057a700f618481;hpb=dbc37438687e110697574d175e4eca5f9cbeae81;p=git.git diff --git a/git-octopus.sh b/git-octopus.sh index abc68202..d2471af3 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