X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/890dbdede9545f927385bfd798f34831df3fc537..49a6af92db204536f6752583c1c24a34c1070c8c:/vcsh diff --git a/vcsh b/vcsh index 6ce5320..a6d8213 100755 --- 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