From ef0bfa25e99627b809c0902d21072821955db3fe Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 21 Jun 2005 15:40:00 -0700 Subject: Remove MERGE_HEAD in "git checkout/reset" Both of these scripts will end up resetting the index to some specific head, and any unresolved merge will be forgotten. --- git-reset-script | 2 ++ 1 file changed, 2 insertions(+) (limited to 'git-reset-script') diff --git a/git-reset-script b/git-reset-script index eaefd00d9d..fe773388c9 100755 --- a/git-reset-script +++ b/git-reset-script @@ -1,3 +1,5 @@ #!/bin/sh +: ${GIT_DIR=.git} git-read-tree --reset HEAD git-update-cache --refresh +rm -f "$GIT_DIR/MERGE_HEAD" -- cgit v1.3