Merge branch 'jc/merge-refuse-new-root'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 19:59:08 +0000 (12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 19:59:08 +0000 (12:59 -0700)
commit175008d...5474ff78ca9e3dcf038df359a97b4d92
tree7dc4add...53d353d40a49a1c440d186e4c134cd07copy hash to clipboard (tree)
parentd689301...43f6dc14d71e7d33e1b8ea600ae1b67bcopy hash to clipboard (diff)
parent09c2cb8...7a9cc0f6f25eac8d43663f4e8f3309a4copy hash to clipboard (diff)
builtin/pull.c