Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)Author
2011-08-15merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren
2011-08-15t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren
2011-08-15merge-recursive: Avoid unnecessary file rewritesElijah Newren
2011-08-15t6022: Additional tests checking for unnecessary updates of filesElijah Newren
2011-08-15merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren
2011-08-15t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren
2011-08-15t3030: fix accidental success in symlink renameJeff King
2011-08-15merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren
2011-08-15merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren
2011-08-15merge-recursive: Make modify/delete handling code reusableElijah Newren
2011-08-15merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren
2011-08-15merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren
2011-08-15merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren
2011-08-15merge-recursive: When we detect we can skip an update, actually skip itElijah Newren
2011-08-15merge-recursive: Provide more info in conflict markers with file renamesElijah Newren
2011-08-15merge-recursive: Improve handling of rename target vs. directory additionElijah Newren
2011-08-15merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren
2011-08-15merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren
2011-08-15merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren
2011-08-15merge-recursive: Fix sorting order and directory change assumptionsElijah Newren
2011-08-15merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren
2011-08-15t6022: Add testcase for merging a renamed file with a simple changeElijah Newren
2011-08-15t6022: New tests checking for unnecessary updates of filesElijah Newren
2011-08-15t6022: Remove unnecessary untracked files to make test cleanerElijah Newren
2011-08-15t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren
2011-08-15t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren
2011-08-15t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren
2011-08-15t6036: criss-cross with weird content can fool git into clean mergeElijah Newren
2011-08-15t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren
2011-08-15t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren
2011-08-15t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren
2011-08-15t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren
2011-08-15t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren
2011-08-15t6042: Add a pair of cases where undetected renames cause issuesElijah Newren
2011-08-15t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren
2011-08-15t6042: Add a testcase where git deletes an untracked fileElijah Newren
2011-06-02Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano
2011-05-31Merge branch 'ml/test-readme' into maintJunio C Hamano
2011-05-31Merge branch 'ab/i18n-fixup' into maintJunio C Hamano
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano
2011-05-30Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano
2011-05-26Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano
2011-05-26Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano
2011-05-26Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano
2011-05-26Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano
2011-05-26Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano
2011-05-25init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy
2011-05-25handle_options(): do not miscount how many arguments were usedJunio C Hamano
2011-05-25config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King
2011-05-20do not read beyond end of malloc'd bufferJim Meyering
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 22:36:40 +0300