Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 4766036ecdee2d45b5a955409da5e6751c3e2f05)
drwxr-xr-x - multimail
-rwxr-xr-x 22102 post-receive-email
-rw-r--r-- 1291 pre-auto-gc-battery
-rw-r--r-- 6920 setgitperms.perl
-rw-r--r-- 11647 update-paranoid