Merge branch 'master' of github.com:RichiH/vcsh

diff --combined vcsh
index b675edd1d4e81d4fc7459bd27d500ad716ab2aa7,31a60194de79ecfdec0da5a3de7e4be2df6d4218..e07cffbb5922d436c732e527cfba3f35664792b8
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -19,7 -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.20140313'
 +VERSION='1.20140508'
  SELF=$(basename $0)
  
  fatal() {
@@@ -161,7 -161,7 +161,7 @@@ clone() 
        done
        [ x"$VCSH_CONFLICT" = x'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
@@@ -255,7 -255,7 +255,7 @@@ list_tracked_by() 
  pull() {
        hook pre-pull
        for VCSH_REPO_NAME in $(list); do
 -              printf "$VCSH_REPO_NAME: "
 +              printf '%s: ' "$VCSH_REPO_NAME"
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
                git pull
@@@ -268,7 -268,7 +268,7 @@@
  push() {
        hook pre-push
        for VCSH_REPO_NAME in $(list); do
 -              printf "$VCSH_REPO_NAME: "
 +              printf '%s: ' "$VCSH_REPO_NAME"
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
                git push