diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:40:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:40:00 -0700 |
| commit | ef0bfa25e99627b809c0902d21072821955db3fe (patch) | |
| tree | 5760644db3f9cb044c99aa0f9ce4fc8d4eb76da1 /object.h | |
| parent | 6b38a402e97274037982a5346ca4168cc8ee026c (diff) | |
| download | git-ef0bfa25e99627b809c0902d21072821955db3fe.tar.gz | |
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.
Diffstat (limited to 'object.h')
0 files changed, 0 insertions, 0 deletions