Merge branch 'jc/merge-x-theirs-docfix'
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 4da3e234f5a3989328c4dc8368cf5906f8679b30)
drwxr-xr-x - multimail
-rwxr-xr-x 22070 post-receive-email
-rwxr-xr-x 1249 pre-auto-gc-battery
-rwxr-xr-x 6920 setgitperms.perl
-rwxr-xr-x 11647 update-paranoid