summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ci: remove GETTEXT_POISON jobsÆvar Arnfjörð Bjarmason2021-01-214-5/+4
* The first batch in 2.31 cycleJunio C Hamano2021-01-063-2/+34
* Merge branch 'es/perf-export-fix'Junio C Hamano2021-01-061-4/+1
|\
| * t/perf: avoid unnecessary test_export() recursionEric Sunshine2020-12-221-4/+1
* | Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files'Junio C Hamano2021-01-061-8/+8
|\ \
| * | test: bisect-porcelain: fix location of filesFelipe Contreras2020-12-211-8/+8
* | | Merge branch 'es/worktree-repair-both-moved'Junio C Hamano2021-01-064-1/+73
|\ \ \
| * | | worktree: teach `repair` to fix multi-directional breakageEric Sunshine2020-12-214-1/+73
* | | | Merge branch 'en/merge-ort-recursive'Junio C Hamano2021-01-065-18/+138
|\ \ \ \
| * | | | merge-ort: implement merge_incore_recursive()Elijah Newren2020-12-162-2/+98
| * | | | merge-ort: make clear_internal_opts() aware of partial clearingElijah Newren2020-12-161-6/+7
| * | | | merge-ort: copy a few small helper functions from merge-recursive.cElijah Newren2020-12-161-0/+20
| * | | | commit: move reverse_commit_list() from merge-recursiveElijah Newren2020-12-163-11/+14
* | | | | Merge branch 'fc/pull-merge-rebase'Junio C Hamano2021-01-062-32/+104
|\ \ \ \ \
| * | | | | pull: display default warning only when non-ffFelipe Contreras2020-12-152-7/+66
| * | | | | pull: correct condition to trigger non-ff adviceJunio C Hamano2020-12-151-13/+19
| * | | | | pull: get rid of unnecessary global variableJunio C Hamano2020-12-151-6/+5
| * | | | | pull: give the advice for choosing rebase/merge much laterFelipe Contreras2020-12-141-14/+18
| * | | | | pull: refactor fast-forward checkFelipe Contreras2020-12-141-11/+15
* | | | | | Merge branch 'en/merge-ort-2'Junio C Hamano2021-01-061-19/+191
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | merge-ort: add modify/delete handling and delayed output processingElijah Newren2020-12-131-2/+98
| * | | | | merge-ort: add die-not-implemented stub handle_content_merge() functionElijah Newren2020-12-131-0/+14
| * | | | | merge-ort: add function grouping commentsElijah Newren2020-12-131-0/+21
| * | | | | merge-ort: add a paths_to_free field to merge_options_internalElijah Newren2020-12-131-1/+25
| * | | | | merge-ort: add a path_conflict field to merge_options_internalElijah Newren2020-12-131-0/+7
| * | | | | merge-ort: add a clear_internal_opts helperElijah Newren2020-12-131-16/+24
| * | | | | merge-ort: add a few includesElijah Newren2020-12-131-0/+2
* | | | | | Merge branch 'en/merge-ort-impl'Junio C Hamano2021-01-064-5/+1256
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge-ort: free data structures in merge_finalize()Elijah Newren2020-12-131-1/+31
| * | | | | merge-ort: add implementation of record_conflicted_index_entries()Elijah Newren2020-12-131-1/+87
| * | | | | tree: enable cmp_cache_name_compare() to be used elsewhereElijah Newren2020-12-132-1/+3
| * | | | | merge-ort: add implementation of checkout()Elijah Newren2020-12-131-1/+44
| * | | | | merge-ort: basic outline for merge_switch_to_result()Elijah Newren2020-12-131-1/+41
| * | | | | merge-ort: step 3 of tree writing -- handling subdirectories as we goElijah Newren2020-12-131-8/+234
| * | | | | merge-ort: step 2 of tree writing -- function to create tree objectElijah Newren2020-12-131-1/+66
| * | | | | merge-ort: step 1 of tree writing -- record basenames, modes, and oidsElijah Newren2020-12-131-3/+37
| * | | | | merge-ort: have process_entries operate in a defined orderElijah Newren2020-12-131-3/+50
| * | | | | merge-ort: add a preliminary simple process_entries() implementationElijah Newren2020-12-131-1/+102
| * | | | | merge-ort: avoid recursing into identical treesElijah Newren2020-12-131-0/+13
| * | | | | merge-ort: record stage and auxiliary info for every pathElijah Newren2020-12-131-7/+90
| * | | | | merge-ort: compute a few more useful fields for collect_merge_infoElijah Newren2020-12-131-0/+36
| * | | | | merge-ort: avoid repeating fill_tree_descriptor() on the same treeElijah Newren2020-12-131-4/+22
| * | | | | merge-ort: implement a very basic collect_merge_info()Elijah Newren2020-12-131-1/+134
| * | | | | merge-ort: add an err() function similar to one from merge-recursiveElijah Newren2020-12-132-3/+37
| * | | | | merge-ort: use histogram diffElijah Newren2020-12-131-0/+4
| * | | | | merge-ort: port merge_start() from merge-recursiveElijah Newren2020-12-131-1/+44
| * | | | | merge-ort: add some high-level algorithm structureElijah Newren2020-12-131-1/+67
| * | | | | merge-ort: setup basic internal data structuresElijah Newren2020-12-131-0/+147
| * | | | | Merge branch 'en/strmap' into en/merge-ort-implJunio C Hamano2020-11-1127-170/+621
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'tb/pack-bitmap'Junio C Hamano2021-01-0610-296/+578
|\ \ \ \ \ \ \
View Lorry Controller Status