Merge branch 'en/d-f-conflict-fix'
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 3f29dd6c2344c56aad263a82a773ead0d9fded30)
-rwxr-xr-x 20679 post-receive-email
-rw-r--r-- 1291 pre-auto-gc-battery
-rw-r--r-- 6920 setgitperms.perl
-rw-r--r-- 11647 update-paranoid