summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | | | | | | t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren2011-08-141-0/+26
| * | | | | | | | | | | | | | | | | t3030: fix accidental success in symlink renameJeff King2011-08-141-2/+5
| * | | | | | | | | | | | | | | | | merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-141-1/+10
| * | | | | | | | | | | | | | | | | merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | | | | | | merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-141-2/+2
| * | | | | | | | | | | | | | | | | merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-142-29/+11
| * | | | | | | | | | | | | | | | | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | | | | | | merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-141-2/+2
| * | | | | | | | | | | | | | | | | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-08-141-2/+2
| * | | | | | | | | | | | | | | | | merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-142-5/+72
| * | | | | | | | | | | | | | | | | merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-142-3/+3
| * | | | | | | | | | | | | | | | | merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-141-8/+9
| * | | | | | | | | | | | | | | | | merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | | | | | | merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | | | | | | merge-recursive: Fix sorting order and directory change assumptionsElijah Newren2011-08-141-8/+18
| * | | | | | | | | | | | | | | | | merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2011-08-141-2/+2
| * | | | | | | | | | | | | | | | | t6022: Add testcase for merging a renamed file with a simple changeElijah Newren2011-08-141-0/+27
| * | | | | | | | | | | | | | | | | t6022: New tests checking for unnecessary updates of filesElijah Newren2011-08-141-0/+63
| * | | | | | | | | | | | | | | | | t6022: Remove unnecessary untracked files to make test cleanerElijah Newren2011-08-141-0/+1
| * | | | | | | | | | | | | | | | | t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren2011-08-141-0/+77
| * | | | | | | | | | | | | | | | | t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren2011-08-141-0/+88
| * | | | | | | | | | | | | | | | | t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren2011-08-141-0/+159
| * | | | | | | | | | | | | | | | | t6036: criss-cross with weird content can fool git into clean mergeElijah Newren2011-08-141-0/+83
| * | | | | | | | | | | | | | | | | t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren2011-08-141-0/+83
| * | | | | | | | | | | | | | | | | t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren2011-08-141-0/+125
| * | | | | | | | | | | | | | | | | t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren2011-08-141-0/+102
| * | | | | | | | | | | | | | | | | t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren2011-08-141-0/+141
| * | | | | | | | | | | | | | | | | t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren2011-08-141-0/+65
| * | | | | | | | | | | | | | | | | t6042: Add a pair of cases where undetected renames cause issuesElijah Newren2011-08-141-0/+61
| * | | | | | | | | | | | | | | | | t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren2011-08-141-0/+39
| * | | | | | | | | | | | | | | | | t6042: Add a testcase where git deletes an untracked fileElijah Newren2011-08-142-1/+37
* | | | | | | | | | | | | | | | | | git-svn: Teach dcommit --mergeinfo to handle multiple linesBryan Jacobs2011-09-011-0/+13
* | | | | | | | | | | | | | | | | | git-svn: New flag to emulate empty directoriesRay Chen2011-09-011-0/+153
* | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-clone-gitdir'Junio C Hamano2011-08-281-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | clone: allow to clone from .git fileNguyễn Thái Ngọc Duy2011-08-221-0/+4
* | | | | | | | | | | | | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-282-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Show interpreted branch name in error messagesConrad Irwin2011-08-221-0/+9
| * | | | | | | | | | | | | | | | | | Prevent force-updating of the current branchConrad Irwin2011-08-222-0/+20
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/pager-with-external-command'Junio C Hamano2011-08-281-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | support pager.* for external commandsJeff King2011-08-191-0/+36
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-clone-alternates'Junio C Hamano2011-08-281-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | clone: clone from a repository with relative alternatesJunio C Hamano2011-08-231-1/+9
| * | | | | | | | | | | | | | | | | | clone: allow more than one --referenceJunio C Hamano2011-08-221-0/+15
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-282-23/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | color: delay auto-color decision until point of useJeff King2011-08-191-0/+12
| * | | | | | | | | | | | | | | | | setup_pager: set GIT_PAGER_IN_USEJeff King2011-08-181-0/+11
| * | | | | | | | | | | | | | | | | t7006: use test_config helpersJeff King2011-08-181-21/+18
| * | | | | | | | | | | | | | | | | test-lib: add helper functions for configJeff King2011-08-181-0/+18
| * | | | | | | | | | | | | | | | | t7006: modernize calls to unsetJeff King2011-08-181-2/+2
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
View Lorry Controller Status