From: Richard Hartmann <richih@debian.org>
Date: Thu, 8 May 2014 17:58:56 +0000 (+0200)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/8659c804cad99f97a6325590be2f8c90874fa470?ds=inline;hp=-c

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

8659c804cad99f97a6325590be2f8c90874fa470
diff --combined vcsh
index b675edd,31a6019..e07cffb
--- a/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