granicus.if.org Git - git/commit

]> granicus.if.org Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Wed, 3 Jul 2013 22:30:59 +0000 (15:30 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 3 Jul 2013 22:30:59 +0000 (15:30 -0700)
commit	318e758f327c486a606ece48c5dfb5fa6e5d39d5
tree	5f127b8b570a11cf61311f99b24769a21c3b7ef5	tree \| snapshot
parent	b3bf469bf8d4cff6fbfef7db1c6f74b63906a317	commit \| diff
parent	46ec510ac088ac2669e617a4c8c35e6218dabecc	commit \| diff

Merge branch 'cb/log-follow-with-combined' into maint

"git log -c --follow $path" segfaulted upon hitting the commit that
renamed the $path being followed.

* cb/log-follow-with-combined:
fix segfault with git log -c --follow

combine-diff.c	diff1 \|	diff2 \|	blob \| history
t/t4202-log.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

combine-diff.c	diff1 \|	diff2 \|	blob \| history
t/t4202-log.sh	diff1 \|	diff2 \|	blob \| history