summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-15 01:56:05 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-15 01:56:05 (GMT)
commit40d8cfe4117564e5520e8f4f953addaa94844476 (patch)
tree9dd2fb169a2d4a2c0f49bf9537cf9aa314614342 /git-resolve-script
parent479346adc5ebb099121063d4c06da30093ed9b3b (diff)
downloadgit-40d8cfe4117564e5520e8f4f953addaa94844476.zip
git-40d8cfe4117564e5520e8f4f953addaa94844476.tar.gz
git-40d8cfe4117564e5520e8f4f953addaa94844476.tar.bz2
Trivial git script fixups
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".
Diffstat (limited to 'git-resolve-script')
-rwxr-xr-x[-rw-r--r--]git-resolve-script0
1 files changed, 0 insertions, 0 deletions
diff --git a/git-resolve-script b/git-resolve-script
index 0b04a5f..0b04a5f 100644..100755
--- a/git-resolve-script
+++ b/git-resolve-script