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.
This commit is contained in:
Linus Torvalds
2005-06-21 15:40:00 -07:00
parent 6b38a402e9
commit ef0bfa25e9
2 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,5 @@
#!/bin/sh
: ${GIT_DIR=.git}
git-read-tree --reset HEAD
git-update-cache --refresh
rm -f "$GIT_DIR/MERGE_HEAD"