X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/9d697e4db2b3f8444d0b4d6c668ed2d05e6eeb36..a952800661456fd5eb1801168380b7210d581371:/doc/hooks?ds=sidebyside

diff --git a/doc/hooks b/doc/hooks
index f1787a3..282ee86 100644
--- a/doc/hooks
+++ b/doc/hooks
@@ -1,7 +1,5 @@
 Available hooks are:
 
-* pre-command
-* post-command
 * pre-clone
 * post-clone
 * post-clone-retired
@@ -10,9 +8,26 @@ Available hooks are:
 	repositories, but you do not want to include it into your vcsh
 	repository. For instance, if you use vim plugins manager (vundle,
 	NeoBundle), zsh configuration frameworks (oh-my-zsh, prezto), etc.
+* pre-command
+* 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
+* post-push
 * pre-run
 * 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.