OSDN Git Service

(root) / git-core / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b0db48 1c25d2d)
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:30 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:30 +0000 (14:45 -0800)
commit1749053d0278f2a533f79915f03c379e5f738b39
treeb4de22a11564dc1248cbce10a3d7ac1c5129e81ftree | snapshot
parent8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33commit | diff
parent1c25d2d8ed4c5154c9059918e20e75cda3bede81commit | diff
Merge branch 'jc/renormalize-merge-kill-safer-crlf'

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
Mirror of official git.git repository
About OSDN
Find Software
Develop Software
Help