summaryrefslogtreecommitdiffstats
path: root/t/t9154 (unfollow)
Commit message (Expand)AuthorFilesLines
2011-08-14merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren1-3/+8
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren2-16/+25
2011-08-14merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren1-15/+34
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsElijah Newren2-13/+53
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2-2/+4
2011-08-14merge-recursive: Avoid working directory changes during recursive caseElijah Newren1-0/+7
2011-08-14merge-recursive: Remember to free generated unique path namesElijah Newren1-8/+12
2011-08-14merge-recursive: Consolidate different update_stages functionsElijah Newren1-18/+9
2011-08-14merge-recursive: Mark some diff_filespec struct arguments constElijah Newren1-9/+10
2011-08-14merge-recursive: Correct a commentElijah Newren1-1/+1
2011-08-14merge-recursive: Make BUG message more legible by adding a newlineElijah Newren1-1/+1
2011-08-14t6022: Add testcase for merging a renamed file with a simple changeElijah Newren1-0/+27
2011-08-14t6022: New tests checking for unnecessary updates of filesElijah Newren1-0/+63
2011-08-14t6022: Remove unnecessary untracked files to make test cleanerElijah Newren1-0/+1
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren1-0/+77
2011-08-14t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren1-0/+88
2011-08-14t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren1-0/+159
2011-08-14t6036: criss-cross with weird content can fool git into clean mergeElijah Newren1-0/+83
2011-08-14t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren1-0/+83
2011-08-14t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren1-0/+125
2011-08-14t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren1-0/+102
2011-08-14t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren1-0/+141
2011-08-14t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren1-0/+65
2011-08-14t6042: Add a pair of cases where undetected renames cause issuesElijah Newren1-0/+61
2011-08-14t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren1-0/+39
2011-08-14t6042: Add a testcase where git deletes an untracked fileElijah Newren2-1/+37
2011-06-09fetch: do not leak a refspecJim Meyering1-2/+4
2011-06-01Git 1.7.5.4v1.7.5.4Junio C Hamano3-2/+6
2011-06-01diffcore-rename.c: avoid set-but-not-used warningJim Meyering1-2/+1
2011-05-31Start 1.7.5.4 draft release notesJunio C Hamano2-1/+19
2011-05-30Documentation: do not misinterpret refspecs as bold textJonathan Nieder1-3/+3
2011-05-27config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano1-0/+1
2011-05-27docs: fix some antique example outputJeff King2-4/+4
2011-05-27docs: make sure literal "->" isn't converted to arrowJeff King2-5/+5
2011-05-27docs: update status --porcelain formatJeff King1-4/+23
2011-05-27docs: minor grammar fixes to git-statusJeff King1-3/+4
2011-05-27git-submodule.sh: separate parens by a space to avoid confusing some shellsBrandon Casey1-1/+1
2011-05-26Documentation/technical/api-diff.txt: correct name of diff_unmerge()Brandon Casey1-2/+2
2011-05-26read_gitfile_gently: use ssize_t to hold read resultJeff King1-1/+1
2011-05-26remove tests of always-false conditionJim Meyering2-2/+2
2011-05-26rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering1-2/+8
2011-05-26Git 1.7.5.3v1.7.5.3Junio C Hamano4-3/+36
2011-05-25userformat_find_requirements(): find requirement for the correct formatJunio C Hamano1-1/+1
2011-05-25init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy6-8/+6
2011-05-25handle_options(): do not miscount how many arguments were usedJunio C Hamano2-5/+3
2011-05-25config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2-40/+18
2011-05-25git_config: don't peek at global config_parametersJeff King1-4/+11
2011-05-25config: make environment parsing routines staticJeff King2-4/+2
2011-05-20do not read beyond end of malloc'd bufferJim Meyering2-2/+36
2011-05-20git-svn: Fix git svn log --show-commitMichael J Gruber2-1/+16
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 00:15:40 +0100