diff options
Diffstat (limited to 'git-resolve-script')
| -rw-r--r-- | git-resolve-script | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/git-resolve-script b/git-resolve-script index 4fc7a6dce3..186b234b24 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -39,14 +39,13 @@ if [ "$common" == "$head" ]; then echo "Destroying all noncommitted data!" echo "Kill me within 3 seconds.." sleep 3 - git-read-tree -m $merge || exit 1 - git-checkout-cache -f -u -a + git-read-tree -u -m $head $merge || exit 1 echo $merge > "$GIT_DIR"/HEAD git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat exit 0 fi echo "Trying to merge $merge into $head" -git-read-tree -m $common $head $merge || exit 1 +git-read-tree -u -m $common $head $merge || exit 1 merge_msg="Merge of $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then @@ -58,5 +57,4 @@ 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-checkout-cache -f -u -a git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat |