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