summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2011-08-16Merge branch 'jc/submodule-sync-no-auto-vivify' into maintLibravatar Junio C Hamano1-2/+13
2011-08-16Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintLibravatar Junio C Hamano1-0/+18
2011-08-16Merge branch 'aw/rebase-i-p' into maintLibravatar Junio C Hamano3-3/+29
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintLibravatar Junio C Hamano1-0/+212
2011-08-16rev-parse: add option --resolve-git-dir <path>Libravatar Fredrik Gustafsson3-54/+58
2011-08-16revert: plug memory leak in "cherry-pick root commit" codepathLibravatar Jonathan Nieder1-1/+26
2011-08-14fast-import: prevent producing bad deltaLibravatar Dmitry Ivankov1-1/+1
2011-08-14fast-import: add a test for tree delta base corruptionLibravatar Dmitry Ivankov1-0/+41
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destLibravatar Elijah Newren1-1/+1
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyLibravatar Elijah Newren1-0/+69
2011-08-14merge-recursive: Avoid unnecessary file rewritesLibravatar Elijah Newren1-3/+3
2011-08-14t6022: Additional tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+91
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesLibravatar Elijah Newren1-1/+1
2011-08-14t6022: Add testcase for spurious "refusing to lose untracked" messagesLibravatar Elijah Newren1-0/+26
2011-08-14t3030: fix accidental success in symlink renameLibravatar Jeff King1-2/+5
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addLibravatar Elijah Newren1-1/+10
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Make modify/delete handling code reusableLibravatar Elijah Newren1-2/+2
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsLibravatar Elijah Newren2-29/+11
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseLibravatar Elijah Newren1-2/+2
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren1-2/+2
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren2-5/+72
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionLibravatar Elijah Newren2-3/+3
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadLibravatar Elijah Newren1-8/+9
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsLibravatar Elijah Newren1-8/+18
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictLibravatar Elijah Newren1-2/+2
2011-08-14t6022: Add testcase for merging a renamed file with a simple changeLibravatar Elijah Newren1-0/+27
2011-08-14t6022: New tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+63
2011-08-14t6022: Remove unnecessary untracked files to make test cleanerLibravatar Elijah Newren1-0/+1
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyLibravatar Elijah Newren1-0/+77
2011-08-14t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyLibravatar Elijah Newren1-0/+88
2011-08-14t6036: tests for criss-cross merges with various directory/file conflictsLibravatar Elijah Newren1-0/+159
2011-08-14t6036: criss-cross with weird content can fool git into clean mergeLibravatar Elijah Newren1-0/+83
2011-08-14t6036: Add differently resolved modify/delete conflict in criss-cross testLibravatar Elijah Newren1-0/+83
2011-08-14t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsLibravatar Elijah Newren1-0/+125
2011-08-14t6042: Ensure rename/rename conflicts leave index and workdir in sane stateLibravatar Elijah Newren1-0/+102
2011-08-14t6042: Add tests for content issues with modify/rename/directory conflictsLibravatar Elijah Newren1-0/+141
2011-08-14t6042: Add a testcase where undetected rename causes silent file deletionLibravatar Elijah Newren1-0/+65
2011-08-14t6042: Add a pair of cases where undetected renames cause issuesLibravatar Elijah Newren1-0/+61
2011-08-14t6042: Add failing testcase for rename/modify/add-source conflictLibravatar Elijah Newren1-0/+39
2011-08-14t6042: Add a testcase where git deletes an untracked fileLibravatar Elijah Newren2-1/+37
2011-08-11ls-files: fix pathspec display on errorLibravatar Clemens Buchacher1-0/+70
2011-08-11test: consolidate definition of $LFLibravatar Junio C Hamano5-9/+4
2011-08-11Tolerate zlib deflation with window size < 32KbLibravatar Roberto Tyley18-0/+71
2011-08-11am: ignore leading whitespace before patchLibravatar David Barr1-0/+18
2011-08-11add update 'none' flag to disable update of submodule by defaultLibravatar Heiko Voigt1-0/+62
2011-08-11fsck: improve committer/author checkLibravatar Dmitry Ivankov1-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 21:11:59 +0000