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

diff --combined vcsh
index c446fb981ce89e4561f2bace26036a7cfb869da3,4e618dfbff60878636a10a629225d8e411541c2a..9b1a5588b5b8732c363cb4b4f5235b81fdfbd5e7
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  # This program is licensed under the GNU GPL version 2 or later.
- # (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com>, 2011-2012
+ # (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com>, 2011-2013
  # For details, see LICENSE. To submit patches, you have to agree to
  # license your code under the GNU GPL version 2 or later.
  
@@@ -9,10 -9,10 +9,11 @@@
  # explain the choice of GPLv2+ over GPLv3+.
  # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain
  # full compability with git. In case git ever changes its licensing terms,
+ # which is admittedly extremely unlikely to the point of being impossible,
  # this software will most likely follow suit.
  
  SELF=$(basename $0)
 +VERSION='1.2'
  
  fatal() {
        echo "$SELF: fatal: $1" >&2
@@@ -91,7 -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
@@@ -286,9 -285,6 +287,9 @@@ if [ "$1" = 'clone' ]; the
        [ -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