Merge branch 'jk/add-p-skip-conflicts'
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 3c524002d67471f8ef5455ef0e5ce3e6fc846b32)
-rwxr-xr-x 21536 post-receive-email
-rw-r--r-- 1291 pre-auto-gc-battery
-rw-r--r-- 6920 setgitperms.perl
-rw-r--r-- 11647 update-paranoid