X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/41f68579e858270d2b97deed93927922d46dde6d..de2dae3f098322537efa91a80001add0de1e1822:/doc/hooks

diff --git a/doc/hooks b/doc/hooks
index e7fdb94..282ee86 100644
--- a/doc/hooks
+++ b/doc/hooks
@@ -12,6 +12,14 @@ Available hooks are:
 * post-command
 * pre-enter
 * post-enter
+* pre-init
+* post-init
+* pre-merge
+	Use this hook to detect and handle merge conflicts before vcsh's native code
+	finds and errors on them. This is useful for allowing clones on top of existing
+	files.
+* post-merge
+	Use this hook to finish handling any merge conflicts found in the pre-merge hook.
 * pre-pull
 * post-pull
 * pre-push
@@ -20,3 +28,6 @@ Available hooks are:
 * post-run
 * pre-upgrade
 * post-upgrade
+
+If you write any interesting or useful hooks, please send them upstream
+so they can be included in an examples section.