| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | merge-recursive: add handling for rename/rename/add-dest/add-dest | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | merge-recursive: Make modify/delete handling code reusable | Elijah Newren | 2011-08-14 | 1 | -2/+2 |
| * | merge-recursive: Consider modifications in rename/rename(2to1) conflicts | Elijah Newren | 2011-08-14 | 2 | -29/+11 |
| * | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | merge-recursive: Fix modify/delete resolution in the recursive case | Elijah Newren | 2011-08-14 | 1 | -2/+2 |
| * | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 2011-08-14 | 1 | -2/+2 |
| * | merge-recursive: Provide more info in conflict markers with file renames | Elijah Newren | 2011-08-14 | 2 | -5/+72 |
| * | merge-recursive: Improve handling of rename target vs. directory addition | Elijah Newren | 2011-08-14 | 2 | -3/+3 |
| * | merge-recursive: Make dead code for rename/rename(2to1) conflicts undead | Elijah Newren | 2011-08-14 | 1 | -8/+9 |
| * | merge-recursive: Fix deletion of untracked file in rename/delete conflicts | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | merge-recursive: Allow make_room_for_path() to remove D/F entries | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | merge-recursive: Fix sorting order and directory change assumptions | Elijah Newren | 2011-08-14 | 1 | -8/+18 |
| * | merge-recursive: Fix recursive case with D/F conflict via add/add conflict | Elijah Newren | 2011-08-14 | 1 | -2/+2 |
| * | t6022: Add testcase for merging a renamed file with a simple change | Elijah Newren | 2011-08-14 | 1 | -0/+27 |
| * | t6022: New tests checking for unnecessary updates of files | Elijah Newren | 2011-08-14 | 1 | -0/+63 |
| * | t6022: Remove unnecessary untracked files to make test cleaner | Elijah Newren | 2011-08-14 | 1 | -0/+1 |
| * | t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify | Elijah Newren | 2011-08-14 | 1 | -0/+77 |
| * | t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify | Elijah Newren | 2011-08-14 | 1 | -0/+88 |
| * | t6036: tests for criss-cross merges with various directory/file conflicts | Elijah Newren | 2011-08-14 | 1 | -0/+159 |
| * | t6036: criss-cross with weird content can fool git into clean merge | Elijah Newren | 2011-08-14 | 1 | -0/+83 |
| * | t6036: Add differently resolved modify/delete conflict in criss-cross test | Elijah Newren | 2011-08-14 | 1 | -0/+83 |
| * | t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts | Elijah Newren | 2011-08-14 | 1 | -0/+125 |
| * | t6042: Ensure rename/rename conflicts leave index and workdir in sane state | Elijah Newren | 2011-08-14 | 1 | -0/+102 |
| * | t6042: Add tests for content issues with modify/rename/directory conflicts | Elijah Newren | 2011-08-14 | 1 | -0/+141 |
| * | t6042: Add a testcase where undetected rename causes silent file deletion | Elijah Newren | 2011-08-14 | 1 | -0/+65 |
| * | t6042: Add a pair of cases where undetected renames cause issues | Elijah Newren | 2011-08-14 | 1 | -0/+61 |
| * | t6042: Add failing testcase for rename/modify/add-source conflict | Elijah Newren | 2011-08-14 | 1 | -0/+39 |
| * | t6042: Add a testcase where git deletes an untracked file | Elijah Newren | 2011-08-14 | 2 | -1/+37 |
| * | Merge branch 'jk/maint-config-alias-fix' into maint | Junio C Hamano | 2011-06-01 | 1 | -0/+7 |
| |\ |
|
| | * | handle_options(): do not miscount how many arguments were used | Junio C Hamano | 2011-05-24 | 1 | -1/+1 |
| | * | config: always parse GIT_CONFIG_PARAMETERS during git_config | Jeff King | 2011-05-24 | 1 | -0/+7 |
| * | | Merge branch 'ml/test-readme' into maint | Junio C Hamano | 2011-05-31 | 1 | -8/+9 |
| |\ \ |
|
| | * | | t/README: unify documentation of test function args | Mathias Lafeldt | 2011-04-26 | 1 | -8/+9 |
| * | | | Merge branch 'ab/i18n-fixup' into maint | Junio C Hamano | 2011-05-31 | 36 | -363/+343 |
| |\ \ \ |
|
| | * | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 | Junio C Hamano | 2011-04-14 | 4 | -19/+10 |
| | * | | | i18n: use test_i18n{grep,cmp} in t7508 | Junio C Hamano | 2011-04-14 | 1 | -120/+102 |
| | * | | | i18n: use test_i18ngrep in t7506 | Junio C Hamano | 2011-04-14 | 1 | -28/+28 |
| | * | | | i18n: use test_i18ngrep and test_i18ncmp in t7502 | Junio C Hamano | 2011-04-13 | 1 | -41/+31 |
| | * | | | i18n: use test_i18ngrep in t7501 | Junio C Hamano | 2011-04-13 | 1 | -3/+4 |
| | * | | | i18n: use test_i18ncmp in t7500 | Junio C Hamano | 2011-04-13 | 1 | -5/+5 |
| | * | | | i18n: use test_i18ngrep in t7201 | Junio C Hamano | 2011-04-13 | 1 | -7/+7 |
| | * | | | i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 | Junio C Hamano | 2011-04-13 | 2 | -8/+8 |
| | * | | | i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012... | Junio C Hamano | 2011-04-13 | 6 | -17/+15 |
| | * | | | i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 | Junio C Hamano | 2011-04-13 | 3 | -13/+13 |
| | * | | | i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 | Junio C Hamano | 2011-04-13 | 3 | -6/+6 |
| | * | | | i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 | Junio C Hamano | 2011-04-13 | 4 | -19/+21 |
| | * | | | i18n: use test_i18ngrep in lib-httpd and t2019 | Junio C Hamano | 2011-04-13 | 2 | -9/+8 |
| | * | | | i18n: do not overuse C_LOCALE_OUTPUT (grep) | Junio C Hamano | 2011-04-13 | 2 | -5/+23 |
| | * | | | i18n: use test_i18ncmp in t1200 and t2200 | Junio C Hamano | 2011-04-13 | 2 | -4/+4 |
| | * | | | i18n: .git file is not a human readable message (t5601) | Junio C Hamano | 2011-04-13 | 1 | -1/+1 |
