projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6b38a40) | patch
Remove MERGE_HEAD in "git checkout/reset"
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 21 Jun 2005 22:40:00 +0000 (15:40 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 21 Jun 2005 22:40:00 +0000 (15:40 -0700)
commitef0bfa25e99627b809c0902d21072821955db3fe
tree5760644db3f9cb044c99aa0f9ce4fc8d4eb76da1tree | snapshot
parent6b38a402e97274037982a5346ca4168cc8ee026ccommit | diff
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-checkout-script diff | blob | history
git-reset-script diff | blob | history
The core git plumbing