Merge branch 'ld/p4-worktree'
commit101f3dc92a4cedb1f359f6ddce913b631ffa75b6
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:37 +0000 (19 14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:37 +0000 (19 14:45 -0800)
tree4a2a080defff5758fff445e3d31901138be81968
parent09b4fdb5f396612dd50236ae5395a74600d2ab84
parent378f7be1e74661ff1480cc44a5f039ef85da7288
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
git-p4.py