summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano2011-06-011-0/+7
|\
| * handle_options(): do not miscount how many arguments were usedJunio C Hamano2011-05-241-1/+1
| * config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2011-05-241-0/+7
* | Merge branch 'ml/test-readme' into maintJunio C Hamano2011-05-311-8/+9
|\ \
| * | t/README: unify documentation of test function argsMathias Lafeldt2011-04-261-8/+9
* | | Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-3136-363/+343
|\ \ \
| * | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-144-19/+10
| * | | i18n: use test_i18n{grep,cmp} in t7508Junio C Hamano2011-04-141-120/+102
| * | | i18n: use test_i18ngrep in t7506Junio C Hamano2011-04-141-28/+28
| * | | i18n: use test_i18ngrep and test_i18ncmp in t7502Junio C Hamano2011-04-131-41/+31
| * | | i18n: use test_i18ngrep in t7501Junio C Hamano2011-04-131-3/+4
| * | | i18n: use test_i18ncmp in t7500Junio C Hamano2011-04-131-5/+5
| * | | i18n: use test_i18ngrep in t7201Junio C Hamano2011-04-131-7/+7
| * | | i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano2011-04-132-8/+8
| * | | i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012...Junio C Hamano2011-04-136-17/+15
| * | | i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014Junio C Hamano2011-04-133-13/+13
| * | | i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano2011-04-133-6/+6
| * | | i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200Junio C Hamano2011-04-134-19/+21
| * | | i18n: use test_i18ngrep in lib-httpd and t2019Junio C Hamano2011-04-132-9/+8
| * | | i18n: do not overuse C_LOCALE_OUTPUT (grep)Junio C Hamano2011-04-132-5/+23
| * | | i18n: use test_i18ncmp in t1200 and t2200Junio C Hamano2011-04-132-4/+4
| * | | i18n: .git file is not a human readable message (t5601)Junio C Hamano2011-04-131-1/+1
| * | | i18n: do not overuse C_LOCALE_OUTPUTJunio C Hamano2011-04-122-57/+44
| * | | i18n: mark init-db messages for translationÆvar Arnfjörð Bjarmason2011-04-121-2/+5
| * | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+12
* | | | Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-311-0/+25
|\ \ \ \
| * | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-221-0/+25
* | | | | Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano2011-05-291-0/+23
|\ \ \ \ \
| * | | | | tests: check error message from run_commandJonathan Nieder2011-04-201-0/+23
| | |_|/ / | |/| | |
* | | | | Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-261-0/+26
|\ \ \ \ \
| * | | | | do not read beyond end of malloc'd bufferJim Meyering2011-05-201-0/+26
* | | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano2011-05-261-0/+17
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-111-0/+17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-111-0/+17
| | |\ \ \ \ \ \
| | | * | | | | | setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano2011-05-111-0/+17
* | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-261-2/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3503: test cherry picking and reverting root commitsJeff King2011-05-161-2/+25
* | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-261-0/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test core.gitproxy configurationJeff King2011-05-181-0/+43
* | | | | | | | | | | Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano2011-05-261-104/+2
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status