Merge branch 'fc/rerere-conflict-style' into maint
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: ada8710e634b4f9f686bd0477bd92b272ec60801)
drwxr-xr-x - multimail
-rwxr-xr-x 22070 post-receive-email
-rwxr-xr-x 1259 pre-auto-gc-battery
-rwxr-xr-x 6920 setgitperms.perl
-rwxr-xr-x 11647 update-paranoid