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

	Commit message (Expand)	Author	Age
*	do not overwrite untracked symlinks	Clemens Buchacher	2011-02-21
*	Merge branch 'ab/test-2'	Junio C Hamano	2010-09-04
\|\
\| *	tests: implicitly skip SYMLINKS tests using <prereq>	Ævar Arnfjörð Bjarmason	2010-08-18
* \|	Merge branch 'en/d-f-conflict-fix'	Junio C Hamano	2010-08-31
\|\ \ \| \|/ \|/\|
\| *	t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test	Ævar Arnfjörð Bjarmason	2010-07-27
\| *	merge-recursive: Fix D/F conflicts	Elijah Newren	2010-07-09
\| *	Add additional testcases for D/F conflicts	Elijah Newren	2010-07-09
* \|	tests: Skip tests in a way that makes sense under TAP	Ævar Arnfjörð Bjarmason	2010-06-25
\|/
*	tests: update tests that used to fail	Junio C Hamano	2010-01-28
*	Aggressive three-way merge: fix D/F case	Junio C Hamano	2010-01-03
*	traverse_trees(): handle D/F conflict case sanely	Junio C Hamano	2010-01-03
*	t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite	Johannes Sixt	2009-08-09
*	git-checkout: be careful about untracked symlinks	Linus Torvalds	2009-07-29
*	lstat_cache: guard against full match of length of 'name' parameter	Kjetil Barvik	2009-07-29
*	Demonstrate bugs when a directory is replaced with a symlink	Pickens, James E	2009-07-29