X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/264adad0164cc7ff8c8ce4609325699b7c72b5be..45fc3eb10b5bf03031edf96d1576bba77a0aaa96:/vcsh?ds=sidebyside diff --git a/vcsh b/vcsh index 22b4a70..d778100 100755 --- a/vcsh +++ b/vcsh @@ -8,7 +8,7 @@ # While the following is not legally binding, the author would like to # explain the choice of GPLv2+ over GPLv3+. # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain -# full compability with git. In case git ever changes its licensing terms, +# full compatibility's with git. In case git ever changes its licensing terms, # which is admittedly extremely unlikely to the point of being impossible, # this software will most likely follow suit. @@ -24,7 +24,7 @@ basename() { } SELF=$(basename $0) -VERSION='1.2' +VERSION='1.20130614' fatal() { echo "$SELF: fatal: $1" >&2 @@ -131,6 +131,7 @@ info() { } clone() { + hook pre-clone init git remote add origin "$GIT_REMOTE" git config branch.master.remote origin @@ -149,6 +150,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.\n" 17 git merge origin/master + hook post-clone } delete() {