| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-07-09 | merge-recursive: Fix D/F conflicts |  Elijah Newren | 1 | -3/+3 |
| 2010-07-09 | Add additional testcases for D/F conflicts | Elijah Newren | 1 | -4/+60 |
| 2010-01-28 | tests: update tests that used to fail |  Junio C Hamano | 1 | -1/+1 |
| 2010-01-03 | Aggressive three-way merge: fix D/F case | Junio C Hamano | 1 | -1/+1 |
| 2010-01-03 | traverse_trees(): handle D/F conflict case sanely | Junio C Hamano | 1 | -1/+1 |
| 2009-08-09 | t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite |  Johannes Sixt | 1 | -0/+6 |
| 2009-07-29 | git-checkout: be careful about untracked symlinks |  Linus Torvalds | 1 | -1/+1 |
| 2009-07-29 | lstat_cache: guard against full match of length of 'name' parameter |  Kjetil Barvik | 1 | -1/+1 |
| 2009-07-29 | Demonstrate bugs when a directory is replaced with a symlink |  Pickens, James E | 1 | -0/+87 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |