Merge branch 'en/rename-directory-detection' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 23:11:46 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 23:11:46 +0000 (15:11 -0800)
commitd42470f...6ed76a916c46b8a4b6c62bb3792e9220
tree905a6e7...2757b2f74a9e10fd12d15bcec0d5c4facopy hash to clipboard (tree)
parentd543f92...5e61aee239cf988429459101fc14354bcopy hash to clipboard (diff)
parentc5b761f...2711542073cf1906c0e86a34616b79aecopy hash to clipboard (diff)
merge-recursive.c
strbuf.c
strbuf.h
unpack-trees.c