aboutsummaryrefslogtreecommitdiff
path: root/templates/branches--
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-19 14:45:37 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-19 14:45:37 -0800
commit101f3dc92a4cedb1f359f6ddce913b631ffa75b6 (patch)
tree4a2a080defff5758fff445e3d31901138be81968 /templates/branches--
parent09b4fdb5f396612dd50236ae5395a74600d2ab84 (diff)
parent378f7be1e74661ff1480cc44a5f039ef85da7288 (diff)
downloadgit-101f3dc92a4cedb1f359f6ddce913b631ffa75b6.tar.gz
git-101f3dc92a4cedb1f359f6ddce913b631ffa75b6.tar.xz
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
Diffstat (limited to 'templates/branches--')
0 files changed, 0 insertions, 0 deletions