From 9c065315f70fb1086ef16fc37e72e3edbaf3e919 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 8 Jun 2005 13:33:15 -0700 Subject: Make "git commit" work correctly in the presense of a manual merge This has gotten only very light testing, but something like this is clearly necessary and did the right thing for the one case I threw at it. --- git-resolve-script | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'git-resolve-script') diff --git a/git-resolve-script b/git-resolve-script index da79a973e..0b04a5f6a 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -57,4 +57,5 @@ fi result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) echo "Committed merge $result_commit" echo $result_commit > "$GIT_DIR"/HEAD -git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat +git-diff-tree -p $head $result_commit | git-apply --stat +rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD -- cgit v1.2.1