t/300-add.t: Fix warning

[code/vcsh.git] / doc / hooks

diff --git a/doc/hooks b/doc/hooks
index 81f5df2902520e43c4c9a9e0ba5d39cd4f813ff9..282ee86265c765c7a457234931aaed000ae913aa 100644 (file)
--- a/doc/hooks
+++ b/doc/hooks
@@ -1,8 +1,6 @@
 Available hooks are:
 
 Available hooks are:
 

-* pre-command
-* post-command
-* pre-hook
+* pre-clone

 * post-clone
 * post-clone-retired
        Use this if you need to operate on different git repositories after cloning.
 * post-clone
 * post-clone-retired
        Use this if you need to operate on different git repositories after cloning.


@@ -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.
        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-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
 * 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.