git merge --abort deletes unstaged files

2014-09-15 Thread André Hänsel
As discussed in https://groups.google.com/forum/#!topic/git-users/uR7gzLL2Ovc: I ran git merge to merge a branch. There were some conflicted files. Although they were automatically resolved by git rerere, I still had to add them. I accidentally ran "git add ." instead of "git add -u". I noticed my

Is there a hook that runs on git reset?

2013-06-22 Thread André Hänsel
I am using a script that runs as post-checkout and post-merge hook to ensure some permissions on the working copy files. Neither of these hooks is run on git reset, so after a git reset --hard the permissions are lost because apparently the files were created freshly. I guess I would have expected