From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:37 +0000 (-0800)
Subject: Merge branch 'ld/p4-worktree'
X-Git-Tag: v2.12.0-rc0~123
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/101f3dc92a4cedb1f359f6ddce913b631ffa75b6

Merge branch 'ld/p4-worktree'

"git p4" didn't interact with the internal of .git directory
correctly in the modern "git-worktree"-enabled world.

* ld/p4-worktree:
git-p4: support git worktrees
---

101f3dc92a4cedb1f359f6ddce913b631ffa75b6