summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/the-index'Junio C Hamano2019-01-0466-491/+652
|\
| * rebase-interactive.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-123-5/+8
| * rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-126-24/+26
| * pack-*.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-126-14/+21
| * pack-check.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-123-6/+10
| * notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-129-21/+28
| * line-log.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-121-1/+1
| * diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-125-8/+11
| * delta-islands.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-123-15/+22
| * cache-tree.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-128-19/+25
| * bundle.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-124-20/+24
| * branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-127-19/+27
| * bisect.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-123-22/+33
| * blame.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy2018-11-121-17/+22
| * sequencer.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy2018-11-125-77/+86
| * sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-126-152/+197
| * transport.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-123-5/+8
| * notes-merge.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy2018-11-121-2/+2
| * notes-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-123-7/+12
| * list-objects.c: reduce the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-2/+2
| * list-objects-filter.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-123-6/+15
| * wt-status.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy2018-11-123-10/+14
| * wt-status.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-126-47/+66
* | Merge branch 'jk/loose-object-cache'Junio C Hamano2019-01-0418-274/+211
|\ \
| * | odb_load_loose_cache: fix strbuf leakJeff King2018-11-241-0/+1
| * | fetch-pack: drop custom loose object cacheJeff King2018-11-131-37/+2
| * | sha1-file: use loose object cache for quick existence checkJeff King2018-11-132-0/+21
| * | object-store: provide helpers for loose_objects_cacheJeff King2018-11-134-25/+48
| * | sha1-file: use an object_directory for the main object dirJeff King2018-11-1311-147/+90
| * | handle alternates paths the same as the main object dirJeff King2018-11-134-44/+23
| * | sha1_file_name(): overwrite buffer instead of appendingJeff King2018-11-134-14/+12
| * | rename "alternate_object_database" to "object_directory"Jeff King2018-11-1310-69/+69
| * | submodule--helper: prefer strip_suffix() to ends_with()Jeff King2018-11-131-3/+4
| * | fsck: do not reuse child_process structsJeff King2018-11-131-0/+6
| |/
* | Merge branch 'fc/http-version'Junio C Hamano2019-01-042-0/+48
|\ \
| * | http: add support selecting http versionForce Charlie2018-11-092-0/+48
| |/
* | Merge branch 'en/merge-path-collision'Junio C Hamano2019-01-046-292/+1149
|\ \
| * | t6036: avoid non-portable "cp -a"Carlo Marcelo Arenas Belón2018-12-011-1/+1
| * | merge-recursive: combine error handlingDerrick Stolee2018-11-081-26/+27
| * | t6036, t6043: increase code coverage for file collision handlingElijah Newren2018-11-082-0/+88
| * | merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren2018-11-083-94/+113
| * | merge-recursive: use handle_file_collision for add/add conflictsElijah Newren2018-11-081-8/+21
| * | merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren2018-11-084-148/+89
| * | merge-recursive: fix rename/add conflict handlingElijah Newren2018-11-083-64/+101
| * | merge-recursive: new function for better colliding conflict resolutionsElijah Newren2018-11-081-0/+121
| * | merge-recursive: increase marker length with depth of recursionElijah Newren2018-11-084-9/+172
| * | t6036, t6042: testcases for rename collision of already conflicting filesElijah Newren2018-11-082-0/+312
| * | t6042: add tests for consistency in file collision conflict handlingElijah Newren2018-11-081-0/+162
* | | Merge branch 'nd/i18n'Junio C Hamano2019-01-0423-266/+303
|\ \ \
| * | | fsck: mark strings for translationNguyễn Thái Ngọc Duy2018-11-125-82/+90
View Lorry Controller Status