git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-ort.c

projects / thirdparty / git.git / history

2021-01-24	Elijah Newren	merge-ort: fix massive leak	blob \| commitdiff \| raw \| diff to current
2021-01-21	Junio C Hamano	Merge branch 'en/ort-directory-rename' into en/merge...	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: fix a directory rename detection bug	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: process_renames() now needs more defensiveness	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: implement apply_directory_rename_modifications()	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: add a new toplevel_dir field	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: implement handle_path_level_conflicts()	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: implement check_for_directory_rename()	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: implement apply_dir_rename() and check_dir_r...	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: implement compute_collisions()	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: modify collect_renames() for directory renam...	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: implement handle_directory_level_conflicts()	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: implement compute_rename_counts()	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: copy get_renamed_dir_portion() from merge...	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: add outline of get_provisional_directory_ren...	blob \| commitdiff \| raw \| diff to current
2021-01-21	Elijah Newren	merge-ort: add outline for computing directory renames	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'jc/macos-install-dependencies-fix'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'tb/local-clone-race-doc'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'bc/doc-status-short'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'dl/p4-encode-after-kw-expansion'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'ab/gettext-charset-comment-fix'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'ug/doc-lose-dircache'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'ad/t4129-setfacl-target-fix'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'jk/t5516-deflake'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'vv/send-email-with-less-secure-apps-access'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'pb/mergetool-tool-help-fix'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'ds/for-each-repo-noopfix'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'jc/sign-off'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'mt/t4129-with-setgid-dir'	blob \| commitdiff \| raw \| diff to current
2021-01-16	Junio C Hamano	Merge branch 'ds/maintenance-part-4'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'fc/completion-aliases-support'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'en/stash-apply-sparse-checkout'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'ar/t6016-modernise'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'zh/arg-help-format'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'nk/perf-fsmonitor-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'ds/trace2-topo-walk'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'rs/rebase-commit-validation'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'ma/sha1-is-a-hash'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'ma/doc-pack-format-varint-for-sizes'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'ma/t1300-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'pb/doc-modules-git-work-tree-typofix'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'ta/doc-typofix'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'bc/rev-parse-path-format'	blob \| commitdiff \| raw \| diff to current
2021-01-15	Junio C Hamano	Merge branch 'ew/decline-core-abbrev'	blob \| commitdiff \| raw \| diff to current
2021-01-14	Junio C Hamano	Merge branch 'en/ort-conflict-handling' into en/merge...	blob \| commitdiff \| raw \| diff to current
2021-01-14	Junio C Hamano	Merge branch 'en/diffcore-rename' into en/merge-ort...	blob \| commitdiff \| raw \| diff to current
2021-01-07	Elijah Newren	merge-ort: collect which directories are removed in...	blob \| commitdiff \| raw \| diff to current
2021-01-07	Elijah Newren	merge-ort: initialize and free new directory rename...	blob \| commitdiff \| raw \| diff to current
2021-01-07	Elijah Newren	merge-ort: add new data structures for directory rename...	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'en/merge-ort-3' into en/ort-directory...	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'es/perf-export-fix'	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'fc/t6030-bisect-reset-removes-auxiliary...	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'es/worktree-repair-both-moved'	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'en/merge-ort-recursive'	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'fc/pull-merge-rebase'	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'en/merge-ort-2'	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'en/merge-ort-impl'	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'tb/pack-bitmap'	blob \| commitdiff \| raw \| diff to current
2021-01-07	Junio C Hamano	Merge branch 'pk/subsub-fetch-fix-take-2'	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: add handling for different types of files...	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: copy find_first_merges() implementation...	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: implement format_commit()	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: copy and adapt merge_submodule() from merge...	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: copy and adapt merge_3way() from merge-recur...	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: flesh out implementation of handle_content_m...	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: handle book-keeping around two- and three...	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: implement unique_path() helper	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: handle directory/file conflicts that remain	blob \| commitdiff \| raw \| diff to current
2021-01-04	Elijah Newren	merge-ort: handle D/F conflict where directory disappea...	blob \| commitdiff \| raw \| diff to current
2020-12-27	Junio C Hamano	Merge branch 'pb/doc-git-linkit-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-23	Junio C Hamano	Merge branch 'nk/refspecs-negative-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-23	Junio C Hamano	Merge branch 'dl/checkout-p-merge-base'	blob \| commitdiff \| raw \| diff to current
2020-12-23	Junio C Hamano	Merge branch 'jx/pack-redundant-on-single-pack'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge branch 'jc/diff-I-status-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge branch 'es/perf-export-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge branch 'rb/nonstop-config-mak-uname-update'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge branch 'ab/unreachable-break'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge branch 'jc/strmap-remove-typefix'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge branch 'jc/compat-util-setitimer-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-12-17	Junio C Hamano	Merge branch 'jh/index-v2-doc-on-fsmn'	blob \| commitdiff \| raw \| diff to current
2020-12-17	Junio C Hamano	Merge branch 'jb/midx-doc-update'	blob \| commitdiff \| raw \| diff to current
2020-12-17	Elijah Newren	merge-ort: implement merge_incore_recursive()	blob \| commitdiff \| raw \| diff to current
2020-12-17	Elijah Newren	merge-ort: make clear_internal_opts() aware of partial...	blob \| commitdiff \| raw \| diff to current
2020-12-17	Elijah Newren	merge-ort: copy a few small helper functions from merge...	blob \| commitdiff \| raw \| diff to current
2020-12-16	Elijah Newren	merge-ort: add implementation of type-changed rename...	blob \| commitdiff \| raw \| diff to current
2020-12-16	Elijah Newren	merge-ort: add implementation of normal rename handling	blob \| commitdiff \| raw \| diff to current
2020-12-16	Elijah Newren	merge-ort: add implementation of rename collisions	blob \| commitdiff \| raw \| diff to current
2020-12-16	Elijah Newren	merge-ort: add implementation of rename/delete conflicts	blob \| commitdiff \| raw \| diff to current
2020-12-16	Elijah Newren	merge-ort: add implementation of both sides renaming...	blob \| commitdiff \| raw \| diff to current
2020-12-16	Elijah Newren	merge-ort: add implementation of both sides renaming...	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'js/cmake-extra-built-ins-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'da/vs-build-iconv-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'jk/multi-line-indent-style-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'jk/check-config-parsing-error-in-upload...	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'ae/doc-reproducible-html'	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'so/glossary-branch-is-not-necessarily...	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'dd/help-autocorrect-never'	blob \| commitdiff \| raw \| diff to current
2020-12-14	Elijah Newren	merge-ort: add basic outline for process_renames()	blob \| commitdiff \| raw \| diff to current
2020-12-14	Elijah Newren	merge-ort: implement compare_pairs() and collect_renames()	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom