diff options
Diffstat (limited to 'git-resolve-script')
| -rwxr-xr-x | git-resolve-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-resolve-script b/git-resolve-script index 91b001b..bf2fb2d 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -12,7 +12,7 @@ merge_repo="$3" : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"} dropheads() { - rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD" \ + rm -f -- "$GIT_DIR/MERGE_HEAD" \ "$GIT_DIR/LAST_MERGE" || exit 1 } @@ -44,7 +44,7 @@ if [ "$common" == "$head" ]; then echo "Updating from $head to $merge." git-read-tree -u -m $head $merge || exit 1 echo $merge > "$GIT_DIR"/HEAD - git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat + git-diff-tree -p $head $merge | git-apply --stat dropheads exit 0 fi |