org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	i18n: merge-recursive: mark strings for translation	Jiang Xin	2012-07-26
*	merge-recursive: don't detect renames of empty files	Jeff King	2012-03-23
*	merge-recursive: Avoid unnecessary file rewrites	Elijah Newren	2011-08-14
*	t6022: Additional tests checking for unnecessary updates of files	Elijah Newren	2011-08-14
*	merge-recursive: Fix spurious 'refusing to lose untracked file...' messages	Elijah Newren	2011-08-14
*	t6022: Add testcase for spurious "refusing to lose untracked" messages	Elijah Newren	2011-08-14
*	merge-recursive: Make modify/delete handling code reusable	Elijah Newren	2011-08-14
*	merge-recursive: When we detect we can skip an update, actually skip it	Elijah Newren	2011-08-14
*	merge-recursive: Provide more info in conflict markers with file renames	Elijah Newren	2011-08-14
*	merge-recursive: Improve handling of rename target vs. directory addition	Elijah Newren	2011-08-14
*	t6022: Add testcase for merging a renamed file with a simple change	Elijah Newren	2011-08-14
*	t6022: New tests checking for unnecessary updates of files	Elijah Newren	2011-08-14
*	t6022: Remove unnecessary untracked files to make test cleaner	Elijah Newren	2011-08-14
*	Merge branch 'en/merge-recursive'	Junio C Hamano	2010-11-29
\|\
\| *	t6022: Use -eq not = to test output of wc -l	Brian Gernhardt	2010-11-17
\| *	merge_content(): Check whether D/F conflicts are still present	Elijah Newren	2010-09-29
\| *	conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts	Elijah Newren	2010-09-29
\| *	conflict_rename_delete(): Check whether D/F conflicts are still present	Elijah Newren	2010-09-29
\| *	merge-recursive: Delay content merging for renames	Elijah Newren	2010-09-29
\| *	merge-recursive: Move handling of double rename of one file to two	Elijah Newren	2010-09-29
\| *	t6022: Add tests for rename/rename combined with D/F conflicts	Elijah Newren	2010-09-29
\| *	t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)	Elijah Newren	2010-09-29
\| *	t6022: Add tests with both rename source & dest involved in D/F conflicts	Elijah Newren	2010-09-29
\| *	t6022: Add tests for reversing order of merges when D/F conflicts present	Elijah Newren	2010-09-29
\| *	t6022: Add test combinations of {content conflict?, D/F conflict remains?}	Elijah Newren	2010-09-29
* \|	t6022 (renaming merge): chain test commands with &&	Jonathan Nieder	2010-11-09
\|/
*	tests: use "test_cmp", not "diff", when verifying the result	Gary V. Vaughan	2010-05-31
*	Add a test for merging changed and rename-changed branches	Alex Riesen	2007-04-25
*	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-10-27
*	read-tree -m -u: do not overwrite or remove untracked working tree files.	Junio C Hamano	2006-05-17
*	Optionally work without python	Johannes Schindelin	2006-02-18
*	merge-recursive: conflicting rename case.	Junio C Hamano	2005-12-21
*	t/t6022: a new test for renaming merge.	Junio C Hamano	2005-12-11