Merge branch 'jc/better-conflict-resolution'
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 9ba929ed652f5ed7707f1c684999af4ad02c4925)
-rw-r--r-- 18378 post-receive-email
-rw-r--r-- 1099 pre-auto-gc-battery
-rw-r--r-- 6920 setgitperms.perl
-rw-r--r-- 11647 update-paranoid