summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)Author
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsElijah Newren
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren
2011-08-14t6022: Add testcase for merging a renamed file with a simple changeElijah Newren
2011-08-14t6022: New tests checking for unnecessary updates of filesElijah Newren
2011-08-14t6022: Remove unnecessary untracked files to make test cleanerElijah Newren
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren
2011-08-14t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren
2011-08-14t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren
2011-08-14t6036: criss-cross with weird content can fool git into clean mergeElijah Newren
2011-08-14t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren
2011-08-14t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren
2011-08-14t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren
2011-08-14t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren
2011-08-14t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren
2011-08-14t6042: Add a pair of cases where undetected renames cause issuesElijah Newren
2011-08-14t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren
2011-08-14t6042: Add a testcase where git deletes an untracked fileElijah Newren
2011-06-01Merge 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-24handle_options(): do not miscount how many arguments were usedJunio C Hamano
2011-05-24config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King
2011-05-20do not read beyond end of malloc'd bufferJim Meyering
2011-05-20git-svn: Fix git svn log --show-commitMichael J Gruber
2011-05-18test core.gitproxy configurationJeff King
2011-05-16Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano
2011-05-16Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano
2011-05-16Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano
2011-05-16t3503: test cherry picking and reverting root commitsJeff King
2011-05-15Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano
2011-05-15Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano
2011-05-13Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano
2011-05-13Merge branch 'js/blame-parsename' into maintJunio C Hamano
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano
2011-05-13t5400: Fix a couple of typosJohan Herland
2011-05-11Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano
2011-05-11Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano
2011-05-11setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano
2011-05-09t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-26 11:40:34 (GMT)