| commit | ef0bfa25e99627b809c0902d21072821955db3fe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | Tue Jun 21 15:40:00 2005 -0700 |
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Tue Jun 21 15:40:00 2005 -0700 |
| tree | 5760644db3f9cb044c99aa0f9ce4fc8d4eb76da1 | |
| parent | 6b38a402e97274037982a5346ca4168cc8ee026c [diff] [blame] |
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.
diff --git a/git-reset-script b/git-reset-script index eaefd00..fe77338 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"