projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1863e05 1c25d2d)
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:13 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:13 +0000 (10:57 -0800)
commit041b834f81207eeaa9a1ab81e6f388e8c9954082
tree2cfff9cdcb3e596e7a7289af80575cc395b62965tree | snapshot
parent1863e05af5be73d9f7b9a1d22a33ca9849726623commit | diff
parent1c25d2d8ed4c5154c9059918e20e75cda3bede81commit | diff
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into next

Fix a corner case in merge-recursive regression that crept in
during 2.10 development cycle.

* jc/renormalize-merge-kill-safer-crlf:
  convert: git cherry-pick -Xrenormalize did not work
  merge-recursive: handle NULL in add_cacheinfo() correctly
  cherry-pick: demonstrate a segmentation fault
convert.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
t/t3501-revert-cherry-pick.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.