summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-27 00:11:42 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-27 00:11:42 -0800
commitf723df581075ae70252a93ba91dcd017f338236e (patch)
treebbf75e7b9b949e2b6c2e0cfa8d0ab57b6319783a /commit.c
parent08721a056b0370e0de002162dfc5578548c0c116 (diff)
parentdf8a9e86db13f2b8becfde8ed69f80127ba14e20 (diff)
downloadgit-f723df581075ae70252a93ba91dcd017f338236e.tar.gz
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions