Merge branch 'sr/hooks-cwd-doc'

* sr/hooks-cwd-doc:
githooks.txt: clarify push hooks are always executed in $GIT_DIR

diff --combined Documentation/githooks.txt
index 32343ae295e7c94a70f67e9abca542f22d992102,f7d230f2b408c652113c3728339d84de6f229981..706091a569c17cae93e250ed7cb34d056a5b25f0
--- 1/Documentation/githooks.txt
--- 2/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@@ -22,8 -22,10 +22,10 @@@ changed via the `core.hooksPath` config
  linkgit:git-config[1]).
  
  Before Git invokes a hook, it changes its working directory to either
- the root of the working tree in a non-bare repository, or to the
- $GIT_DIR in a bare repository.
+ $GIT_DIR in a bare repository or the root of the working tree in a non-bare
+ repository. An exception are hooks triggered during a push ('pre-receive',
+ 'update', 'post-receive', 'post-update', 'push-to-checkout') which are always
+ executed in $GIT_DIR.
  
  Hooks can get their arguments via the environment, command-line
  arguments, and stdin. See the documentation for each hook below for
@@@ -256,9 -258,6 +258,9 @@@ environment variables will not be set. 
  to use push options, but doesn't transmit any, the count variable
  will be set to zero, `GIT_PUSH_OPTION_COUNT=0`.
  
 +See the section on "Quarantine Environment" in
 +linkgit:git-receive-pack[1] for some caveats.
 +
  [[update]]
  update
  ~~~~~~