| commit | ef0bfa25e99627b809c0902d21072821955db3fe | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 21 Jun 2005 22:40:00 +0000 (21 15:40 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 21 Jun 2005 22:40:00 +0000 (21 15:40 -0700) | ||
| tree | 5760644db3f9cb044c99aa0f9ce4fc8d4eb76da1 | treesnapshot (tar.gz zip) |
| parent | 6b38a402e97274037982a5346ca4168cc8ee026c | commitdiff |
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.
Both of these scripts will end up resetting the index to some specific
head, and any unresolved merge will be forgotten.
| git-checkout-script | diffblobblamehistory | |
| git-reset-script | diffblobblamehistory |