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