updates, document using git post-merge hook since it's available now
[git.ikiwiki.info.git] / doc / usage /
drwxr-xr-x   ..
-rw-r--r-- 176 discussion.mdwn