delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	[PATCH] Make ls-* output consistent with diff-* output format.	Junio C Hamano	2005-05-26	1	-49/+49
\| \| \| \| \| \| \| \| \|	Use SP as the column separator except the ones before path which uses TAB, to make the output format consistent across ls-* and diff-* commands. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
*	[PATCH] Add tests for diff-tree	Junio C Hamano	2005-05-20	1	-170/+1
\| \| \| \| \| \| \|	This adds and reorganizes some tests for diff-tree Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
*	Fix up previous commit	Linus Torvalds	2005-05-19	1	-0/+0
\| \| \| \| \| \| \|	Add '-R' flag to diff-tree, and change the test subdirectory shell files to be executable (something that Junio couldn't get me to do through the pure patch with my current patch handling infrastructure).
*	[PATCH] Add the merge test Linus called "test script from hell".	Junio C Hamano	2005-05-15	1	-0/+313
	This is an adaptation to the test framework of a historic test that was used before three way merge form of read-tree was introduced, and subsequently used to validate the read-tree -m merge works correctly. It covers all the tricky cases known back then and also have been updated to cover conflicting files/directories cases since then. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Petr Baudis <pasky@ucw.cz>