From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Sun, 21 Apr 2013 00:27:29 +0000 (+0200)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/17cd983a970777a7d8196587e5cbc501c63fc64b?hp=de2510255802768699751d54d118c4fc026ff8f4

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

diff --git a/changelog b/changelog
index 2a87fc9..12e3208 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,8 @@
+2013-04-21  Richard Hartmann <richih.mailinglist@gmail.com>
+
+	* Release 1.2
+	* Introduce `vcsh version`
+
 2013-03-31  Richard Hartmann <richih.mailinglist@gmail.com>
 
 	* Release 1.1
diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index f286dc0..e12cf15 100644
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -27,6 +27,8 @@ vcsh(1) - manage config files in $HOME via fake bare git repositories
 
 `vcsh` setup <repo>
 
+`vcsh` version
+
 `vcsh` which <substring>
 
 `vcsh` write-gitignore <repo>
@@ -113,6 +115,9 @@ an interactive user.
 * setup:
   Set up repository with recommended settings.
 
+* version:
+  Print version information.
+
 * which <substring>:
   Find <substring> in name of any tracked file.
 
@@ -232,8 +237,9 @@ None are known at this time, but reports and/or patches are more than welcome.
 
 ## INTEROPERABILITY
 
-If you rely on `git submodule`, use `git` 1.7.12 or later. Earlier versions
-do not clean internal variables properly before descending into a submodule.
+If you rely on `git submodule` use `git` 1.7.12 or later. Earlier versions
+do not clean internal variables properly before descending into submodules,
+resulting in unhappy end users.
 
 ## HISTORY
 
diff --git a/vcsh b/vcsh
index 4e618df..9b1a558 100755
--- a/vcsh
+++ b/vcsh
@@ -13,6 +13,7 @@
 # this software will most likely follow suit.
 
 SELF=$(basename $0)
+VERSION='1.2'
 
 fatal() {
 	echo "$SELF: fatal: $1" >&2
@@ -91,6 +92,7 @@ help() {
    run <repo> \\
        <command>        Use this repository
    setup <repo>         Set up repository with recommended settings
+   version              Print version information
    which <substring>    Find substring in name of any tracked file
    write-gitignore \\
    <repo>               Write .gitignore.d/<repo> via git ls-files
@@ -285,6 +287,9 @@ if [ "$1" = 'clone' ]; then
 	[ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
 	export VCSH_REPO_NAME
 	export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
+elif [ "$1" = 'version' ]; then
+	echo "$SELF $VERSION"
+	exit
 elif [ "$1" = 'which' ]; then
 	[ -z "$2" ] && fatal "$1: please specify a filename" 1
 	[ -n "$3" ] && fatal "$1: too many parameters" 1