summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-11-08merge-recursive: combine error handlingLibravatar Derrick Stolee1-26/+27
2018-11-08t6036, t6043: increase code coverage for file collision handlingLibravatar Elijah Newren2-0/+88
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingLibravatar Elijah Newren3-94/+113
2018-11-08merge-recursive: use handle_file_collision for add/add conflictsLibravatar Elijah Newren1-8/+21
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsLibravatar Elijah Newren4-148/+89
2018-11-08merge-recursive: fix rename/add conflict handlingLibravatar Elijah Newren3-64/+101
2018-11-08merge-recursive: new function for better colliding conflict resolutionsLibravatar Elijah Newren1-0/+121
2018-11-08merge-recursive: increase marker length with depth of recursionLibravatar Elijah Newren4-9/+172
2018-11-08t6036, t6042: testcases for rename collision of already conflicting filesLibravatar Elijah Newren2-0/+312
2018-11-08t6042: add tests for consistency in file collision conflict handlingLibravatar Elijah Newren1-0/+162
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADLibravatar Elijah Newren2-5/+35
2018-10-18merge-recursive: improve auto-merging messages with path collisionsLibravatar Elijah Newren1-2/+2
2018-09-20merge-recursive: rename merge_file_1() and merge_content()Libravatar Elijah Newren1-32/+34
2018-09-20merge-recursive: remove final remaining caller of merge_file_one()Libravatar Elijah Newren1-27/+17
2018-09-20merge-recursive: avoid wrapper function when unnecessary and wastefulLibravatar Elijah Newren1-4/+1
2018-09-20merge-recursive: set paths correctly when three-way merging contentLibravatar Elijah Newren1-40/+9
2018-09-17Initial batch post 2.19Libravatar Junio C Hamano2-2/+113
2018-09-17Merge branch 'nd/bisect-show-list-fix'Libravatar Junio C Hamano1-5/+5
2018-09-17Merge branch 'ab/fetch-tags-noclobber'Libravatar Junio C Hamano7-35/+136
2018-09-17Merge branch 'es/worktree-forced-ops-fix'Libravatar Junio C Hamano6-40/+155
2018-09-17Merge branch 'sg/doc-trace-appends'Libravatar Junio C Hamano1-2/+2
2018-09-17Merge branch 'jk/diff-rendered-docs'Libravatar Junio C Hamano2-9/+32
2018-09-17Merge branch 'jk/patch-corrupted-delta-fix'Libravatar Junio C Hamano3-14/+111
2018-09-17Merge branch 'ds/commit-graph-tests'Libravatar Junio C Hamano8-12/+22
2018-09-17Merge branch 'jk/pack-objects-with-bitmap-fix'Libravatar Junio C Hamano3-12/+97
2018-09-17Merge branch 'rs/mailinfo-format-flowed'Libravatar Junio C Hamano7-2/+2646
2018-09-17Merge branch 'jk/cocci'Libravatar Junio C Hamano75-223/+258
2018-09-17Merge branch 'tg/rerere-doc-updates'Libravatar Junio C Hamano2-0/+10
2018-09-17Merge branch 'es/format-patch-rangediff'Libravatar Junio C Hamano8-25/+144
2018-09-17Merge branch 'es/format-patch-interdiff'Libravatar Junio C Hamano8-28/+177
2018-09-17Merge branch 'cc/delta-islands'Libravatar Junio C Hamano11-43/+932
2018-09-17Merge branch 'jk/trailer-fixes'Libravatar Junio C Hamano14-39/+175
2018-09-17Merge branch 'sb/range-diff-colors'Libravatar Junio C Hamano5-45/+135
2018-09-17Merge branch 'jk/pack-delta-reuse-with-bitmap'Libravatar Junio C Hamano9-52/+260
2018-09-17Merge branch 'nd/unpack-trees-with-cache-tree'Libravatar Junio C Hamano12-22/+344
2018-09-17Merge branch 'ds/reachable'Libravatar Junio C Hamano38-634/+1180
2018-09-17Merge branch 'sb/submodule-update-in-c'Libravatar Junio C Hamano2-52/+164
2018-09-17Merge branch 'tg/rerere'Libravatar Junio C Hamano4-129/+365
2018-09-17Merge branch 'ds/multi-pack-index'Libravatar Junio C Hamano31-66/+1859
2018-09-17Merge branch 'jk/branch-l-1-repurpose'Libravatar Junio C Hamano2-28/+3
2018-09-17Merge branch 'tg/conflict-marker-size'Libravatar Junio C Hamano1-0/+4
2018-09-17Merge branch 'ts/doc-build-manpage-xsl-quietly'Libravatar Junio C Hamano1-1/+1
2018-09-17Merge branch 'jk/rev-list-stdin-noop-is-ok'Libravatar Junio C Hamano4-5/+9
2018-09-17Merge branch 'bp/checkout-new-branch-optim'Libravatar Junio C Hamano3-4/+138
2018-09-17Merge branch 'sg/t1404-update-ref-test-timeout'Libravatar Junio C Hamano1-3/+3
2018-09-17Merge branch 'nd/clone-case-smashing-warning'Libravatar Junio C Hamano6-1/+88
2018-09-17Merge branch 'mk/http-backend-content-length'Libravatar Junio C Hamano1-2/+2
2018-09-17Revert "doc/Makefile: drop doc-diff worktree and temporary files on "make cle...Libravatar Junio C Hamano1-1/+0
2018-09-11http-backend test: make empty CONTENT_LENGTH test more realisticLibravatar Max Kirillov1-2/+2
2018-09-10Git 2.19Libravatar Junio C Hamano2-9/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 21:03:01 +0000