| commit | f723df581075ae70252a93ba91dcd017f338236e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Dec 2016 08:11:42 +0000 (27 00:11 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Dec 2016 08:11:42 +0000 (27 00:11 -0800) | ||
| tree | bbf75e7b9b949e2b6c2e0cfa8d0ab57b6319783a | treesnapshot (tar.gz zip) |
| parent | 08721a056b0370e0de002162dfc5578548c0c116 | commitdiff |
| parent | df8a9e86db13f2b8becfde8ed69f80127ba14e20 | commitdiff |
Merge branch 'ld/p4-compare-dir-vs-symlink'
"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 |