git - Git: sistema de control de versiones

Age	Commit message (Expand)	Author
2010-11-30	Merge branch 'en/merge-recursive'	Junio C Hamano
2010-11-17	t6022: Use -eq not = to test output of wc -l	Brian Gernhardt
2010-11-09	t6022 (renaming merge): chain test commands with &&	Jonathan Nieder
2010-09-30	merge_content(): Check whether D/F conflicts are still present	Elijah Newren
2010-09-30	conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts	Elijah Newren
2010-09-30	conflict_rename_delete(): Check whether D/F conflicts are still present	Elijah Newren
2010-09-30	merge-recursive: Delay content merging for renames	Elijah Newren
2010-09-30	merge-recursive: Move handling of double rename of one file to two	Elijah Newren
2010-09-30	t6022: Add tests for rename/rename combined with D/F conflicts	Elijah Newren
2010-09-30	t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)	Elijah Newren
2010-09-30	t6022: Add tests with both rename source & dest involved in D/F conflicts	Elijah Newren
2010-09-30	t6022: Add tests for reversing order of merges when D/F conflicts present	Elijah Newren
2010-09-30	t6022: Add test combinations of {content conflict?, D/F conflict remains?}	Elijah Newren
2010-05-31	tests: use "test_cmp", not "diff", when verifying the result	Gary V. Vaughan
2007-04-26	Add a test for merging changed and rename-changed branches	Alex Riesen
2006-10-28	t6022: ignoring untracked files by merge-recursive when they do not matter	Junio C Hamano
2006-10-27	tests: merge-recursive is usable without Python	Junio C Hamano
2006-05-17	read-tree -m -u: do not overwrite or remove untracked working tree files.	Junio C Hamano
2006-02-19	Optionally work without python	Johannes Schindelin
2005-12-22	merge-recursive: conflicting rename case.	Junio C Hamano
2005-12-11	t/t6022: a new test for renaming merge.	Junio C Hamano