Merge branch 'nd/git-common-dir-fix' into maint
commit9c17ccaa49d00a87cefe0ef18a371e4f45e968fc
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:39 +0000 (10 11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:40 +0000 (10 11:13 -0800)
tree7298abc8c0eb2d71be9cfda6a324f3d254ae3a00
parent8834ea375a404a6c79a6d8cd8cbc9954c6f2847d
parent17f1365dbce9aa00cab3f196e7fa7138d9081eef
Merge branch 'nd/git-common-dir-fix' into maint

"git rev-parse --git-common-dir" used in the worktree feature
misbehaved when run from a subdirectory.

* nd/git-common-dir-fix:
  rev-parse: take prefix into account in --git-common-dir