index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6035-merge-dir-to-symlink.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2010-09-04
Merge branch 'ab/test-2'
Junio C Hamano
1
-22
/
+16
2010-08-31
Merge branch 'en/d-f-conflict-fix'
Junio C Hamano
1
-4
/
+60
2010-08-18
tests: implicitly skip SYMLINKS tests using <prereq>
Ævar Arnfjörð Bjarmason
1
-13
/
+7
2010-07-27
t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
Ævar Arnfjörð Bjarmason
1
-1
/
+1
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-06-25
tests: Skip tests in a way that makes sense under TAP
Ævar Arnfjörð Bjarmason
1
-1
/
+1
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