Merge branch 'master' into debian

PACKAGING

@@ -11,6 +11,13 @@ the upstream repository
 
 Ubuntu imports Debian's package automagically.
 
+# Mac OS X
+
+Homebrew does not require any packaging information within this repository.
+A separate branch with a statically compiled manpage and release tags is
+provided to ease packaging. The static manpage because Homebrew lacks Ronn;
+the tag so github generates tarballs Homebrew can be pointed at.
+
 # Anything else
 
 If you are maintaining a package for a different distribution, please get

changelog

+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

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
 

vcsh

@@ -12,6 +12,7 @@
 # this software will most likely follow suit.
 
 SELF=$(basename $0)
+VERSION='1.2'
 
 fatal() {
 	echo "$SELF: fatal: $1" >&2
@@ -90,6 +91,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
@@ -284,6 +286,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