2 Commits

Author	SHA1	Message	Date
Junio C Hamano	fcc387db9b	read-tree -m -u: do not overwrite or remove untracked working tree files. ... When a merge results in a creation of a path that did not exist in HEAD, and if you already have that path on the working tree, because the index has not been told about the working tree file, read-tree happily removes it. The issue was brought up by Santi Béjar on the list. Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-05-17 01:52:48 -07:00
Yann Dirson	b91db2707a	Add a minimal test for git-cherry ... This test checks that git-cherry finds the expected number of patches in two simple cases, and then tests the new limit arguments. [jc: collapsed two patches into one and added sleep to make sure the two commits would get different timestamps] Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-01-08 00:54:31 -08:00