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-08-30	Junio C Hamano	Merge branch 'jk/apply-binary-hunk-parsing-fix'	blob \| commitdiff \| raw
2021-08-30	Junio C Hamano	Merge branch 'jc/userdiff-pattern-hint'	blob \| commitdiff \| raw
2021-08-30	Junio C Hamano	Merge branch 'cb/builtin-merge-format-string-fix'	blob \| commitdiff \| raw
2021-08-30	Junio C Hamano	Merge branch 'js/log-protocol-version'	blob \| commitdiff \| raw
2021-08-30	Junio C Hamano	Merge branch 'en/ort-becomes-the-default'	blob \| commitdiff \| raw
2021-08-30	Junio C Hamano	Merge branch 'en/merge-strategy-docs'	blob \| commitdiff \| raw
2021-08-30	Junio C Hamano	Merge branch 'en/pull-conflicting-options'	blob \| commitdiff \| raw
2021-08-24	Junio C Hamano	Merge branch 'ps/fetch-pack-load-refs-optim'	blob \| commitdiff \| raw
2021-08-24	Junio C Hamano	Merge branch 'jt/push-negotiation-fixes'	blob \| commitdiff \| raw
2021-08-24	Junio C Hamano	Merge branch 'es/trace2-log-parent-process-name'	blob \| commitdiff \| raw
2021-08-24	Junio C Hamano	Merge branch 'hn/refs-test-cleanup'	blob \| commitdiff \| raw
2021-08-24	Junio C Hamano	Merge branch 'en/ort-perf-batch-15'	blob \| commitdiff \| raw
2021-08-24	Junio C Hamano	Merge branch 'js/expand-runtime-prefix'	blob \| commitdiff \| raw \| diff to current
2021-08-24	Junio C Hamano	Merge branch 'ab/bundle-doc'	blob \| commitdiff \| raw \| diff to current
2021-08-24	Junio C Hamano	Merge branch 'zh/ref-filter-raw-data'	blob \| commitdiff \| raw \| diff to current
2021-08-24	Junio C Hamano	Merge branch 'ab/pack-stdin-packs-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-24	Junio C Hamano	Merge branch 'ab/http-drop-old-curl'	blob \| commitdiff \| raw \| diff to current
2021-08-24	Junio C Hamano	Merge branch 'ds/add-with-sparse-index'	blob \| commitdiff \| raw \| diff to current
2021-08-24	Junio C Hamano	Merge branch 'jc/bisect-sans-show-branch'	blob \| commitdiff \| raw \| diff to current
2021-08-14	Jiang Xin	Merge branch 'master' of github.com:vnwildman/git	blob \| commitdiff \| raw \| diff to current
2021-08-13	Jiang Xin	Merge branch 'master' of github.com:git/git	blob \| commitdiff \| raw \| diff to current
2021-08-11	Junio C Hamano	Merge branch 'jn/log-m-does-not-imply-p'	blob \| commitdiff \| raw \| diff to current
2021-08-11	Junio C Hamano	Merge branch 'cb/many-alternate-optim-fixup'	blob \| commitdiff \| raw \| diff to current
2021-08-06	Junio C Hamano	Merge branch 'cb/t7508-regexp-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-06	Junio C Hamano	Merge branch 'ab/pickaxe-pcre2'	blob \| commitdiff \| raw \| diff to current
2021-08-06	Junio C Hamano	Merge branch 'fc/disable-checkwinsize'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'tb/mingw-rmdir-symlink-to-directory'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'ar/doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'ab/getcwd-test'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'rs/use-fspathhash'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'pb/merge-autostash-more'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'en/ort-perf-batch-14'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'ds/commit-and-checkout-with-sparse-index'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'ab/update-submitting-patches'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'ah/plugleaks'	blob \| commitdiff \| raw \| diff to current
2021-08-04	Junio C Hamano	Merge branch 'ar/submodule-add'	blob \| commitdiff \| raw \| diff to current
2021-08-03	Elijah Newren	merge-ort: remove compile-time ability to turn off...	blob \| commitdiff \| raw \| diff to current
2021-08-03	Jiang Xin	Merge branch 'master' of github.com:git/git	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'jk/check-pack-valid-before-opening-bitmap'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'jt/bulk-prefetch'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'fc/pull-no-rebase-merges-theirs-into...	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'ab/bundle-tests'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'ps/perf-with-separate-output-directory'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'js/ci-check-whitespace-updates'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'jk/config-env-doc'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'pb/submodule-recurse-doc'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'tb/bitmap-type-filter-comment-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-30	Elijah Newren	merge-ort: reuse path strings in pool_alloc_filespec	blob \| commitdiff \| raw \| diff to current
2021-07-30	Elijah Newren	merge-ort: store filepairs and filespecs in our mem_pool	blob \| commitdiff \| raw \| diff to current
2021-07-30	Elijah Newren	diffcore-rename, merge-ort: add wrapper functions for...	blob \| commitdiff \| raw \| diff to current
2021-07-30	Elijah Newren	merge-ort: switch our strmaps over to using memory...	blob \| commitdiff \| raw \| diff to current
2021-07-30	Elijah Newren	merge-ort: set up a memory pool	blob \| commitdiff \| raw \| diff to current
2021-07-30	Elijah Newren	merge-ort: add pool_alloc, pool_calloc, and pool_strndu...	blob \| commitdiff \| raw \| diff to current
2021-07-30	Elijah Newren	merge-ort: rename str{map,intmap,set}_func()	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'ps/t0000-output-directory-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'tb/reverse-midx'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'hn/refs-debug-empty-prefix'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'pb/dont-complete-aliased-options'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'en/rename-limits-doc'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'ds/gender-neutral-doc-guidelines'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'ds/status-with-sparse-index'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'js/ci-make-sparse'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'ab/pkt-line-tests'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'jk/t0000-subtests-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'dl/diff-merge-base'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'ab/attribute-format'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'jk/log-decorate-optim'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'sm/worktree-add-lock'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'ew/many-alternate-optim'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'hj/commit-allow-empty-message'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'dl/packet-read-response-end-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'bc/rev-list-without-commit-line'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'ab/imap-send-read-everything-simplify'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'ab/gitignore-discovery-doc'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'js/ci-windows-update'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'ab/send-email-optim'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'jk/typofix'	blob \| commitdiff \| raw \| diff to current
2021-07-20	Elijah Newren	merge-ort: restart merge with cached renames to reduce...	blob \| commitdiff \| raw \| diff to current
2021-07-20	Elijah Newren	merge-ort: avoid recursing into directories when we...	blob \| commitdiff \| raw \| diff to current
2021-07-20	Elijah Newren	merge-ort: defer recursing into directories when merge...	blob \| commitdiff \| raw \| diff to current
2021-07-20	Elijah Newren	merge-ort: add a handle_deferred_entries() helper function	blob \| commitdiff \| raw \| diff to current
2021-07-20	Elijah Newren	merge-ort: add data structures for allowable trivial...	blob \| commitdiff \| raw \| diff to current
2021-07-20	Elijah Newren	merge-ort: add some more explanations in collect_merge_...	blob \| commitdiff \| raw \| diff to current
2021-07-20	Elijah Newren	merge-ort: resolve paths early when we have sufficient...	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ds/gender-neutral-doc'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'jt/partial-clone-submodule-1'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ab/struct-init'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'dd/test-stdout-count-lines'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'hn/refs-test-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'rs/khash-alloc-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ar/help-micro-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ar/submodule-helper-include-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ab/bundle-updates'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'hn/refs-iterator-peel-returns-boolean'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ab/mktag-tests'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ab/show-branch-tests'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ab/fetch-negotiate-segv-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ab/make-delete-on-error'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ew/mmap-failures'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'js/config-mak-windows-pcre-fix'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom