Merge branch 'master' into add-tracked-file-126

src/commands/git_secret_usage.sh

@@ -21,8 +21,9 @@ function usage {
   # https://github.com/sobolevn/git-secret/issues/47
   local commands="add|cat|changes|clean|hide|init|killperson|list|remove|reveal|tell|usage|whoknows"
 
-  echo "usage: git secret [$commands]"
-  echo "See 'git secret [command] -h' for information on each one"
+  echo "usage: git secret [--version] [$commands]"
+  echo " 'git secret --version' will show version and exit"
+  echo "See 'git secret [command] -h' for more information on each command below"
   echo " add [filename.txt] - adds file to be hidden. Also add this file to .gitignore"
   echo " cat [filename.txt] - cats the decrypted contents of the named file to stdout"
   echo " changes [filename.secret] - indicates if the file has changed since checkin"