]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 08721a0 df8a9e8)
Merge branch 'ld/p4-compare-dir-vs-symlink'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 08:11:42 +0000 (00:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 08:11:42 +0000 (00:11 -0800)
commitf723df581075ae70252a93ba91dcd017f338236e
treebbf75e7b9b949e2b6c2e0cfa8d0ab57b6319783atree | snapshot
parent08721a056b0370e0de002162dfc5578548c0c116commit | diff
parentdf8a9e86db13f2b8becfde8ed69f80127ba14e20commit | diff
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.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.