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
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
2 matches
Mail list logo