X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/28318554e3933b60023cf946b70f05f3b25e43d6..87df0c6008bb726924da6812f536322bb36ff948:/doc/hooks?ds=sidebyside

diff --git a/doc/hooks b/doc/hooks
index 3c72ef8..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