Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:28 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:28 +0000 (14:49 -0800)
commit7479ca4...44193acee43c480ae37e0bec98316f7a
tree60792ba...01dcb07ccd2ef285b3b55badc56ac525copy hash to clipboard (tree)
parentcf479b4...b5d8417ccea306fa9f3491ec2e873399copy hash to clipboard (diff)
parent1c25d2d...ed4c5154c9059918e20e75cda3bede81copy hash to clipboard (diff)
convert.c
merge-recursive.c
t/t3501-revert-cherry-pick.sh