Merge branch 'ld/p4-worktree' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:06 +0000 (15:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:06 +0000 (15:33 -0800)
commit5210ab9973e294204e7a322ba9a9e8faed9b8c1b
treeffb7b62dc86392c9a03858ab13ceacac4c749ec0
parentbe2531431a68a5559334828c38432c1065109578
parent378f7be1e74661ff1480cc44a5f039ef85da7288
Merge branch 'ld/p4-worktree' into next

"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