Public Git Hosting - git/vmiklos.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d404a3e 24ab81a)

commit	5e9cb8666bae6a5c8adcb26e3f46b8a5fe5be589
author	Junio C Hamano <gitster@pobox.com>
	Mon, 16 Nov 2009 08:02:44 +0000 (16 00:02 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 16 Nov 2009 08:02:44 +0000 (16 00:02 -0800)
tree	469a68e905236e91ac77d470d37ef6ae63617278	tree \| snapshot (tar.gz zip)
parent	d404a3e1a5588fa075e4fae6679603a5add2e4df	commit \| diff
parent	24ab81ae4d12c81076da256b3f9cdde45277f126	commit \| diff

Merge branch 'jk/maint-add-p-empty' into maint

* jk/maint-add-p-empty:
add-interactive: handle deletion of empty files

git-add--interactive.perl	diff1 \|	diff2 \|	blob \| history
t/t3701-add-interactive.sh	diff1 \|	diff2 \|	blob \| history

Miklos' Git tree to make git-merge a builtin.