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?hp=f7ce400c37d3308122195fd70fa79dff7aac00e3

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

diff --git a/_vcsh b/_vcsh
index 47dbd9e..a33551b 100644
--- a/_vcsh
+++ b/_vcsh
@@ -89,6 +89,7 @@ function _vcsh () {
 
 	subcommands=(
 		"clone:clone an existing repository"
+		"commit:commit in all repositories"
 		"delete:delete an existing repository"
 		"enter:enter repository; spawn new <\$SHELL>"
 		"help:display help"
@@ -97,8 +98,10 @@ function _vcsh () {
 		"list-tracked:list all files tracked by vcsh"
 		"list-tracked-by:list files tracked by a repository"
 		"pull:pull from all vcsh remotes"
+		"push:push to vcsh remotes"
 		"rename:rename a repository"
 		"run:run command with <\$GIT_DIR> and <\$GIT_WORK_TREE> set"
+		"status:show statuses of all/one vcsh repositories"
 		"upgrade:upgrade repository to currently recommended settings"
 		"version:print version information"
 		"which:find <substring> in name of any tracked file"
diff --git a/vcsh b/vcsh
index b675edd..e07cffb 100755
--- a/vcsh
+++ b/vcsh
@@ -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