projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af04b11 df8a9e8)
Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:07 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:08 +0000 (15:11 -0800)
commitaa83f7a2a4a677e9eca4a599f47e027ad06716d1
tree8ac18913cd47a341f829c0c96d788b4746f57bd3tree | snapshot
parentaf04b1171b9ed16f5acce0a49fe3bda518a40b7ecommit | diff
parentdf8a9e86db13f2b8becfde8ed69f80127ba14e20commit | diff
Merge branch 'ld/p4-compare-dir-vs-symlink' into maint

"git p4" misbehaved when swapping a directory and a symbolic link.

* ld/p4-compare-dir-vs-symlink:
  git-p4: avoid crash adding symlinked directory
git-p4.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.