]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09b4fdb 378f7be)
Merge branch 'ld/p4-worktree'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:37 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:37 +0000 (14:45 -0800)
"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

1  2 
git-p4.py patch | diff1 | diff2 | blob | history

diff --cc git-p4.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.