X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/e1bb725d9adb0f1814bb5a8969a67feda631ea8b..cb24803b0d99ba0ececdb9906ec15af24be1e381:/vcsh?ds=inline diff --git a/vcsh b/vcsh index 4761a53..6e18e16 100755 --- a/vcsh +++ b/vcsh @@ -1,7 +1,7 @@ #!/bin/sh # This program is licensed under the GNU GPL version 2 or later. -# (c) Richard "RichiH" Hartmann , 2011-2013 +# (c) Richard "RichiH" Hartmann , 2011-2014 # For details, see LICENSE. To submit patches, you have to agree to # license your code under the GNU GPL version 2 or later. @@ -19,7 +19,7 @@ # If '.git-HEAD' is appended to the version, you are seeing an unreleased # version of vcsh; the master branch is supposed to be clean at all times # so you can most likely just use it nonetheless -VERSION='1.20131229.git-HEAD' +VERSION='1.20140313' SELF=$(basename $0) fatal() { @@ -161,7 +161,7 @@ clone() { done [ "$VCSH_CONFLICT" = '1' ]) && 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 + Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17 git merge origin/master hook post-merge hook post-clone