summaryrefslogtreecommitdiff
path: root/git-reset-script
AgeCommit message (Collapse)Author
2005-06-21Remove MERGE_HEAD in "git checkout/reset"Linus Torvalds
Both of these scripts will end up resetting the index to some specific head, and any unresolved merge will be forgotten.
2005-06-15Trivial git script fixupsLinus Torvalds
Fix permissions, and add trivial "reset" and "add" scripts. The "reset" script just resets the index back to head, while the "add" script is just a crutch for people used to do "cvs add".