Merge branch 'nd/git-common-dir-fix'
commit8020803f5057601c1c29ffcdbd309905bd26eef7
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Feb 2016 21:25:53 +0000 (24 13:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Feb 2016 21:25:53 +0000 (24 13:25 -0800)
treed4f0bbfcd50de828c54b8187a98b821c5ad2ce21
parente6a6a768ca472afed90adbbd786e5c04fff6be7b
parent17f1365dbce9aa00cab3f196e7fa7138d9081eef
Merge branch 'nd/git-common-dir-fix'

"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
builtin/rev-parse.c