git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 17 Jan 2017 22:49:28 +0000 (14:49 -0800)
committer	Junio C Hamano <redacted>
	Tue, 17 Jan 2017 22:49:28 +0000 (14:49 -0800)
commit	7479ca4b44193acee43c480ae37e0bec98316f7a
tree	60792ba401dcb07ccd2ef285b3b55badc56ac525	tree \| snapshot
parent	cf479b4fb5d8417ccea306fa9f3491ec2e873399	commit \| diff
parent	1c25d2d8ed4c5154c9059918e20e75cda3bede81	commit \| diff

Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

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

RSS Atom

git clone https://git.99rst.org/PROJECT

convert.c	diff1 \|	diff2 \|	blob \| history
merge-recursive.c	diff1 \|	diff2 \|	blob \| history
t/t3501-revert-cherry-pick.sh	diff1 \|	diff2 \|	blob \| history