Merge branch 'master' of github.com:andkirby/commithook

andkirby · May 24, 2017 · 5f54d90 · 5f54d90
2 parents b4ffbdf + 11483a5
commit 5f54d90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ $ git commit -m 'Added my file.'
 See more details about [short commit messages](docs/commit-msg.md).
 
 ## Installation
-### Latest release is `v2.0.0-beta.35`
+### Latest release is `v2.0.0-beta.39`
 ### Install globally
 To get last beta version please define your `minimum-stability`.
 ```
@@ -70,7 +70,7 @@ If global way doesn't work you may use [installation via `create-project`](docs/
 ### Bugs
 [Issue bugs list](../../labels/bug).
 #### Code validators doesn't work with GIT cache
-The code validation with GIT but it doesn't support git cache. It means if you added a file (`git add file.php`), changed it, and trying to commit (without adding it into GIT cache). In commit, of course, you will get code from cache but validators will validate your real file. ([#113](../../issues/113))
+The code validation works with GIT but it doesn't support git cache. It means if you added a file (`git add file.php`), changed it, and trying to commit (without adding it into GIT cache). In commit, of course, you will get code from cache but validators will validate your real file. ([#113](../../issues/113))
 #### Minor bugs in short commit message
 [#92](../../issues/92), [#91](../../issues/91), [#32](../../issues/32)
 

diff --git a/docs/example-bashrc.md b/docs/example-bashrc.md
@@ -11,6 +11,9 @@ Please update paths if needed.
 export COMPOSER_HOME='~/.composer' # not required for non-Windows systems
 export COMPOSER_CACHE_DIR='~/.composer/cache' # not required for non-Windows systems
 
+# alias for PHP
+alias php='/d/s/php-7.1.0-nts-Win32-VC14-x64/php.exe'
+
 if [ -z "$ORIGINAL_PATH" ]; then
     # this variable prevents adding the same path on reload file
     ORIGINAL_PATH=$PATH
@@ -19,6 +22,7 @@ fi
 
 # Make global composer binary files available for running from everywhere
 PATH=${ORIGINAL_PATH}':~/.composer/vendor/bin'
+PATH=${PATH}':'$(php -i | grep 'php.exe' | head -1 | cut -d '>' -f2- | xargs -i dirname {} | sed -re 's|([A-z]):|/\1|g' )
 ```
 Now you may reload file:
 ```shell

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,7 +1,7 @@
 [Back to top](../README.md)
 
 ## Release notes
-- Last beta: v2.0.0-beta.16
+- Last beta: v2.0.0-beta.39
 - v2.x-dev
     - ([#83](/../../issues/83)) Added command `validator:disable` for quick disable a validator.
     - ([#13](/../../issues/13)) Added an integration with GitHub (for short commit message).