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

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

projects / thirdparty / git.git / history

2022-08-01	Junio C Hamano	Merge branch 'mt/pkt-line-comment-tweak'	blob \| commitdiff \| raw
2022-08-01	Junio C Hamano	Merge branch 'mt/checkout-count-fix'	blob \| commitdiff \| raw
2022-08-01	Junio C Hamano	Merge branch 'cl/rerere-train-with-no-sign'	blob \| commitdiff \| raw
2022-08-01	Junio C Hamano	Merge branch 'ds/rebase-update-ref'	blob \| commitdiff \| raw
2022-08-01	Junio C Hamano	Merge branch 'kk/p4-client-name-encoding-fix'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'mb/p4-utf16-crlf'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'ds/win-syslog-compiler-fix'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'ld/osx-keychain-usage-fix'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'ds/doc-wo-whitelist'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'mb/config-document-include'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'sg/index-format-doc-update'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'ma/sparse-checkout-cone-doc-fix'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'ma/t4200-update'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'tl/pack-bitmap-error-messages'	blob \| commitdiff \| raw
2022-07-27	Junio C Hamano	Merge branch 'js/commit-graph-parsing-without-repo...	blob \| commitdiff \| raw
2022-07-22	Junio C Hamano	Merge branch 'rs/mingw-tighten-mkstemp'	blob \| commitdiff \| raw
2022-07-22	Junio C Hamano	Merge branch 'js/ci-github-workflow-markup'	blob \| commitdiff \| raw
2022-07-22	Junio C Hamano	Merge branch 'js/shortlog-sort-stably'	blob \| commitdiff \| raw
2022-07-22	Junio C Hamano	Merge branch 'js/vimdiff-quotepath-fix'	blob \| commitdiff \| raw
2022-07-22	Junio C Hamano	Merge branch 'gc/bare-repo-discovery'	blob \| commitdiff \| raw
2022-07-19	Junio C Hamano	Merge branch 'll/curl-accept-language'	blob \| commitdiff \| raw
2022-07-19	Junio C Hamano	Merge branch 'jk/diff-files-cleanup-fix'	blob \| commitdiff \| raw
2022-07-19	Junio C Hamano	Merge branch 'rs/cocci-array-copy'	blob \| commitdiff \| raw
2022-07-19	Junio C Hamano	Merge branch 'jk/ref-filter-discard-commit-buffer'	blob \| commitdiff \| raw
2022-07-19	Junio C Hamano	Merge branch 'jk/clone-unborn-confusion'	blob \| commitdiff \| raw
2022-07-19	Junio C Hamano	Merge branch 'hx/lookup-commit-in-graph-fix'	blob \| commitdiff \| raw
2022-07-19	Junio C Hamano	Merge branch 'jc/resolve-undo'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'sg/multi-pack-index-parse-options-fix'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'bc/nettle-sha256'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'jd/gpg-interface-trust-level-string'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'ab/cocci-unused'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'gc/submodule-use-super-prefix'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'en/merge-dual-dir-renames-fix'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'ab/test-without-templates'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'ab/build-gitweb'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'ab/test-tool-leakfix'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'ab/leakfix'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'jc/builtin-mv-move-array'	blob \| commitdiff \| raw
2022-07-18	Junio C Hamano	Merge branch 'fr/vimdiff-layout-fix'	blob \| commitdiff \| raw
2022-07-14	Junio C Hamano	Merge branch 'ab/submodule-cleanup'	blob \| commitdiff \| raw
2022-07-14	Junio C Hamano	Merge branch 'sy/mv-out-of-cone'	blob \| commitdiff \| raw
2022-07-14	Junio C Hamano	Merge branch 'hx/unpack-streaming'	blob \| commitdiff \| raw
2022-07-14	Junio C Hamano	Merge branch 'en/merge-tree'	blob \| commitdiff \| raw
2022-07-11	Junio C Hamano	Merge branch 'jk/optim-promisor-object-enumeration'	blob \| commitdiff \| raw \| diff to current
2022-07-04	Junio C Hamano	Merge 'js/add-i-delete' into maint-2.37	blob \| commitdiff \| raw \| diff to current
2022-07-03	Junio C Hamano	Merge branch 'js/add-i-delete'	blob \| commitdiff \| raw \| diff to current
2022-06-23	Johannes Schindelin	Sync with 2.35.4	blob \| commitdiff \| raw \| diff to current
2022-06-23	Johannes Schindelin	Sync with 2.32.3	blob \| commitdiff \| raw \| diff to current
2022-06-23	Johannes Schindelin	Sync with 2.30.5	blob \| commitdiff \| raw \| diff to current
2022-06-22	Elijah Newren	merge-ort: optionally produce machine-readable output	blob \| commitdiff \| raw
2022-06-22	Johannes Schindelin	merge-ort: make `path_messages` a strmap to a string_list	blob \| commitdiff \| raw \| diff to current
2022-06-22	Johannes Schindelin	merge-ort: store messages in a list, not in a single...	blob \| commitdiff \| raw \| diff to current
2022-06-22	Elijah Newren	merge-ort: provide a merge_get_conflicted_files() helpe...	blob \| commitdiff \| raw \| diff to current
2022-06-22	Elijah Newren	merge-ort: split out a separate display_update_messages...	blob \| commitdiff \| raw \| diff to current
2022-06-18	Junio C Hamano	Merge branch 'cb/path-owner-check-with-sudo-plus'	blob \| commitdiff \| raw \| diff to current
2022-06-13	Junio C Hamano	Merge branch 'ds/credentials-in-url'	blob \| commitdiff \| raw \| diff to current
2022-06-13	Junio C Hamano	Merge branch 'tl/ls-tree-oid-only'	blob \| commitdiff \| raw \| diff to current
2022-06-10	Junio C Hamano	Merge branch 'gc/zero-length-branch-config-fix'	blob \| commitdiff \| raw \| diff to current
2022-06-10	Junio C Hamano	Merge branch 'cb/buggy-gcc-12-workaround'	blob \| commitdiff \| raw \| diff to current
2022-06-08	Junio C Hamano	Merge branch 'ds/midx-normalize-pathname-before-compari...	blob \| commitdiff \| raw \| diff to current
2022-06-08	Junio C Hamano	Merge branch 'pw/test-malloc-with-sanitize-address...	blob \| commitdiff \| raw \| diff to current
2022-06-08	Junio C Hamano	Merge branch 'rs/commit-summary-wo-break-rewrite' into...	blob \| commitdiff \| raw \| diff to current
2022-06-08	Junio C Hamano	Merge branch 'mg/detect-compiler-in-c-locale' into...	blob \| commitdiff \| raw \| diff to current
2022-06-08	Junio C Hamano	Merge branch 'jc/show-branch-g-current' into maint	blob \| commitdiff \| raw \| diff to current
2022-06-08	Junio C Hamano	Merge branch 'jc/http-clear-finished-pointer' into...	blob \| commitdiff \| raw \| diff to current
2022-06-08	Junio C Hamano	Merge branch 'js/ci-gcc-12-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2022-06-07	Junio C Hamano	Merge branch 'jc/all-negative-pathspec'	blob \| commitdiff \| raw \| diff to current
2022-06-07	Junio C Hamano	Merge branch 'rs/document-archive-prefix'	blob \| commitdiff \| raw \| diff to current
2022-06-03	Junio C Hamano	Merge branch 'tb/midx-race-in-pack-objects'	blob \| commitdiff \| raw \| diff to current
2022-06-03	Junio C Hamano	Merge branch 'pb/use-freebsd-12.3-in-cirrus-ci'	blob \| commitdiff \| raw \| diff to current
2022-06-01	Junio C Hamano	Merge branch 'jc/http-clear-finished-pointer'	blob \| commitdiff \| raw \| diff to current
2022-06-01	Junio C Hamano	Merge branch 'js/ci-gcc-12-fixes'	blob \| commitdiff \| raw \| diff to current
2022-05-31	Junio C Hamano	Merge branch 'js/use-builtin-add-i'	blob \| commitdiff \| raw \| diff to current
2022-05-31	Junio C Hamano	Merge branch 'jc/t6424-failing-merge-preserve-local...	blob \| commitdiff \| raw \| diff to current
2022-05-28	Junio C Hamano	Merge branch 'rs/document-archive-prefix' into js/scala...	blob \| commitdiff \| raw \| diff to current
2022-05-26	Junio C Hamano	Merge branch 'cb/path-owner-check-with-sudo'	blob \| commitdiff \| raw \| diff to current
2022-05-25	Junio C Hamano	Merge branch 'tb/receive-pack-code-cleanup'	blob \| commitdiff \| raw \| diff to current
2022-05-25	Junio C Hamano	Merge branch 'jt/fetch-peek-optional-section'	blob \| commitdiff \| raw \| diff to current
2022-05-25	Junio C Hamano	Merge branch 'jc/show-branch-g-current'	blob \| commitdiff \| raw \| diff to current
2022-05-25	Junio C Hamano	Merge branch 'ep/coverage-report-wants-test-to-have...	blob \| commitdiff \| raw \| diff to current
2022-05-23	Junio C Hamano	Merge branch 'ab/commit-plug-leaks'	blob \| commitdiff \| raw \| diff to current
2022-05-20	Junio C Hamano	Merge branch 'ep/maint-equals-null-cocci'	blob \| commitdiff \| raw \| diff to current
2022-05-20	Junio C Hamano	Merge branch 'gc/pull-recurse-submodules'	blob \| commitdiff \| raw \| diff to current
2022-05-20	Junio C Hamano	Merge branch 'mg/detect-compiler-in-c-locale'	blob \| commitdiff \| raw \| diff to current
2022-05-20	Junio C Hamano	Merge branch 'km/t3501-use-test-helpers'	blob \| commitdiff \| raw \| diff to current
2022-05-20	Junio C Hamano	Merge branch 'pb/submodule-recurse-mode-enum'	blob \| commitdiff \| raw \| diff to current
2022-05-20	Junio C Hamano	Merge branch 'gf/unused-includes'	blob \| commitdiff \| raw \| diff to current
2022-05-11	Junio C Hamano	Merge branch 'rs/commit-summary-wo-break-rewrite'	blob \| commitdiff \| raw \| diff to current
2022-05-11	Junio C Hamano	Merge branch 'pw/test-malloc-with-sanitize-address'	blob \| commitdiff \| raw \| diff to current
2022-05-11	Junio C Hamano	Merge branch 'ea/rebase-code-simplify'	blob \| commitdiff \| raw \| diff to current
2022-05-11	Junio C Hamano	Merge branch 'master' of git://git.ozlabs.org/~paulus...	blob \| commitdiff \| raw \| diff to current
2022-05-11	Junio C Hamano	Merge branch 'ea/progress-partial-blame'	blob \| commitdiff \| raw \| diff to current
2022-05-11	Junio C Hamano	Merge branch 'jh/p4-various-fixups'	blob \| commitdiff \| raw \| diff to current
2022-05-05	Junio C Hamano	Merge branch 'rs/name-rev-fix-free-after-use' into...	blob \| commitdiff \| raw \| diff to current
2022-05-04	Junio C Hamano	Merge branch 'cm/reftable-0-length-memset'	blob \| commitdiff \| raw \| diff to current
2022-05-04	Junio C Hamano	Merge branch 'ds/midx-normalize-pathname-before-comparison'	blob \| commitdiff \| raw \| diff to current
2022-05-02	Junio C Hamano	Merge branch 'ep/maint-equals-null-cocci' into ep/equal...	blob \| commitdiff \| raw \| diff to current
2022-04-28	Junio C Hamano	Merge branch 'rs/name-rev-fix-free-after-use'	blob \| commitdiff \| raw \| diff to current
2022-04-17	Junio C Hamano	Merge branch 'cb/buggy-gcc-12-workaround'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom