summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren
2011-08-14merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren
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-14merge-recursive: Avoid working directory changes during recursive caseElijah Newren
2011-08-14merge-recursive: Remember to free generated unique path namesElijah Newren
2011-08-14merge-recursive: Consolidate different update_stages functionsElijah Newren
2011-08-14merge-recursive: Mark some diff_filespec struct arguments constElijah Newren
2011-08-14merge-recursive: Correct a commentElijah Newren
2011-08-14merge-recursive: Make BUG message more legible by adding a newlineElijah 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-09fetch: do not leak a refspecJim Meyering
2011-06-01Git 1.7.5.4v1.7.5.4Junio C Hamano
2011-06-01Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano
2011-06-01Merge branch 'jc/fmt-req-fix' into maintJunio C Hamano
2011-06-01Merge branch 'jk/maint-docs' into maintJunio C Hamano
2011-06-01Merge branch 'jn/doc-remote-helpers' into maintJunio C Hamano
2011-06-01Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano
2011-06-01diffcore-rename.c: avoid set-but-not-used warningJim Meyering
2011-05-31Start 1.7.5.4 draft release notesJunio C Hamano
2011-05-31Merge branch 'tr/add-i-no-escape' into maintJunio C Hamano
2011-05-31Merge branch 'vh/config-interactive-singlekey-doc' 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-31Merge branch 'rr/doc-content-type' into maintJunio C Hamano
2011-05-30Documentation: do not misinterpret refspecs as bold textJonathan Nieder
2011-05-30Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano
2011-05-30Merge branch 'bc/maint-submodule-fix-parked' into maintJunio C Hamano
2011-05-30Merge branch 'bc/maint-api-doc-parked' into maintJunio C Hamano
2011-05-30Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano
2011-05-27config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano
2011-05-27docs: fix some antique example outputJeff King
2011-05-27docs: make sure literal "->" isn't converted to arrowJeff King
2011-05-27docs: update status --porcelain formatJeff King
2011-05-27docs: minor grammar fixes to git-statusJeff King