| commit | aa83f7a2a4a677e9eca4a599f47e027ad06716d1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Jan 2017 23:11:07 +0000 (17 15:11 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Jan 2017 23:11:08 +0000 (17 15:11 -0800) | ||
| tree | 8ac18913cd47a341f829c0c96d788b4746f57bd3 | treesnapshot (tar.gz zip) |
| parent | af04b1171b9ed16f5acce0a49fe3bda518a40b7e | commitdiff |
| parent | df8a9e86db13f2b8becfde8ed69f80127ba14e20 | commitdiff |
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" 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 | blobhistory |