Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Use rev-parse to find gitdir when generating commit-msg hook hint

Change-Id: Ib373c4f0004ba8ab635e1995e6af2049d5f03ca3