kernel/git - git - PowerEL Git System

6954 Commits

6 Branches

36 Tags

131 MiB

Tree: 3fbe2d54d7

Commit Graph

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>	19 years ago
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>	19 years ago

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>

19 years ago

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>

19 years ago

2 Commits (3fbe2d54d7d91378934df7b16d70dc5877586fae)