summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren2011-08-141-15/+34
* merge-recursive: Fix sorting order and directory change assumptionsElijah Newren2011-08-142-13/+53
* merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2011-08-142-2/+4
* merge-recursive: Avoid working directory changes during recursive caseElijah Newren2011-08-141-0/+7
* merge-recursive: Remember to free generated unique path namesElijah Newren2011-08-141-8/+12
* merge-recursive: Consolidate different update_stages functionsElijah Newren2011-08-141-18/+9
* merge-recursive: Mark some diff_filespec struct arguments constElijah Newren2011-08-141-9/+10
* merge-recursive: Correct a commentElijah Newren2011-08-141-1/+1
* merge-recursive: Make BUG message more legible by adding a newlineElijah Newren2011-08-141-1/+1
* t6022: Add testcase for merging a renamed file with a simple changeElijah Newren2011-08-141-0/+27
* t6022: New tests checking for unnecessary updates of filesElijah Newren2011-08-141-0/+63
* t6022: Remove unnecessary untracked files to make test cleanerElijah Newren2011-08-141-0/+1
* t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren2011-08-141-0/+77
* t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren2011-08-141-0/+88
* 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
* fetch: do not leak a refspecJim Meyering2011-06-081-2/+4
* Git 1.7.5.4v1.7.5.4Junio C Hamano2011-06-013-2/+6
* Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano2011-06-014-48/+30
|\
| * handle_options(): do not miscount how many arguments were usedJunio C Hamano2011-05-242-5/+3
| * config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2011-05-242-40/+18
| * git_config: don't peek at global config_parametersJeff King2011-05-241-4/+11
| * config: make environment parsing routines staticJeff King2011-05-242-4/+2
* | Merge branch 'jc/fmt-req-fix' into maintJunio C Hamano2011-06-011-1/+1
|\ \
| * | userformat_find_requirements(): find requirement for the correct formatJunio C Hamano2011-05-251-1/+1
* | | Merge branch 'jk/maint-docs' into maintJunio C Hamano2011-06-014-15/+35
|\ \ \
| * | | docs: fix some antique example outputJeff King2011-05-262-4/+4
| * | | docs: make sure literal "->" isn't converted to arrowJeff King2011-05-262-5/+5
| * | | docs: update status --porcelain formatJeff King2011-05-261-4/+23
| * | | docs: minor grammar fixes to git-statusJeff King2011-05-261-3/+4
* | | | Merge branch 'jn/doc-remote-helpers' into maintJunio C Hamano2011-06-011-3/+3
|\ \ \ \
| * | | | Documentation: do not misinterpret refspecs as bold textJonathan Nieder2011-05-301-3/+3
* | | | | Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-06-011-0/+1
|\ \ \ \ \
| * | | | | config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano2011-05-271-0/+1
* | | | | | diffcore-rename.c: avoid set-but-not-used warningJim Meyering2011-06-011-2/+1
* | | | | | Start 1.7.5.4 draft release notesJunio C Hamano2011-05-312-1/+19
* | | | | | Merge branch 'tr/add-i-no-escape' into maintJunio C Hamano2011-05-311-0/+19
|\ \ \ \ \ \
| * | | | | | add -i: ignore terminal escape sequencesThomas Rast2011-05-171-0/+19
* | | | | | | Merge branch 'vh/config-interactive-singlekey-doc' into maintJunio C Hamano2011-05-315-13/+21
|\ \ \ \ \ \ \
| * | | | | | | git-reset.txt: better docs for '--patch'Valentin Haenel2011-05-051-3/+4
| * | | | | | | git-checkout.txt: better docs for '--patch'Valentin Haenel2011-05-051-3/+4
| * | | | | | | git-stash.txt: better docs for '--patch'Valentin Haenel2011-05-051-4/+5
View Lorry Controller Status