add hooks to enable auto handing of merge conflicts

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 6ce5320a620e098d2907c127261c65a0a334a939..a6d82138307a2d00e93f8c944b3f93ac03e69316 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -152,6 +152,7 @@ clone() {
                exit
        fi
        git fetch
+       hook pre-merge
        git ls-tree -r --name-only origin/master | (while read object; do
                [ -e "$object" ] &&
                        error "'$object' exists." &&
@@ -161,6 +162,7 @@ clone() {
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
        git merge origin/master
+       hook post-merge
        hook post-clone
        retire
        hook post-clone-retired