git/git-reset-script
Linus Torvalds ef0bfa25e9 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.
2005-06-21 15:40:00 -07:00

5 lines
110 B
Bash
Executable file

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