]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge.c
strmap: enable allocations to come from a mem_pool
[thirdparty/git.git] / builtin / merge.c
2020-10-09  Junio C HamanoMerge branch 'js/no-builtins-on-disk-option'
2020-10-09  Junio C HamanoMerge branch 'jk/index-pack-hotfixes'
2020-10-09  Junio C HamanoMerge branch 'hx/push-atomic-with-cert'
2020-10-05  Junio C HamanoMerge branch 'sn/fast-import-doc'
2020-10-05  Junio C HamanoMerge branch 'jk/diff-cc-oidfind-fix'
2020-10-05  Junio C HamanoMerge branch 'jk/refspecs-negative'
2020-10-05  Junio C HamanoMerge branch 'rs/archive-add-file'
2020-10-05  Junio C HamanoMerge branch 'jt/keep-partial-clone-filter-upon-lazy...
2020-10-05  Junio C HamanoMerge branch 'td/submodule-update-quiet'
2020-10-05  Junio C HamanoMerge branch 'js/cmake-vs'
2020-10-05  Junio C HamanoMerge branch 'ma/worktree-cleanups'
2020-10-05  Junio C HamanoMerge branch 'so/combine-diff-simplify'
2020-10-05  Junio C HamanoMerge branch 'js/default-branch-name-part-2'
2020-10-05  Junio C HamanoMerge branch 'ds/in-merge-bases-many-optim-bug'
2020-10-04  Junio C HamanoMerge branch 'mt/delta-base-cache-races'
2020-10-04  Junio C HamanoMerge branch 'jk/shortlog-group-by-trailer'
2020-10-04  Junio C HamanoMerge branch 'jc/fmt-merge-msg-suppress-destination'
2020-10-04  Junio C HamanoMerge branch 'tb/upload-pack-filters'
2020-10-04  Junio C HamanoMerge branch 'jc/sequencer-stopped-sha-simplify'
2020-10-04  Junio C HamanoMerge branch 'al/ref-filter-merged-and-no-merged'
2020-10-04  Junio C HamanoMerge branch 'eg/mailinfo-doc-scissors'
2020-10-04  Junio C HamanoMerge branch 'mr/bisect-in-c-2'
2020-10-04  Junio C HamanoMerge branch 'cc/bisect-start-fix'
2020-10-04  Junio C HamanoMerge branch 'jc/blame-ignore-fix'
2020-10-04  Junio C HamanoMerge branch 'jk/drop-unaligned-loads'
2020-10-04  Junio C HamanoMerge branch 'js/no-builtins-on-disk-option'
2020-10-04  Junio C HamanoMerge branch 'ab/mediawiki-fixes'
2020-10-03  Junio C HamanoMerge remote-tracking branch 'paulus/master' into pm...
2020-09-29  Junio C HamanoMerge branch 'ah/pull'
2020-09-29  Junio C HamanoMerge branch 'tg/range-diff-same-file-fix'
2020-09-29  Junio C HamanoMerge branch 'jc/t1506-rev-parse-leaves-range-endpoint...
2020-09-29  Junio C HamanoMerge branch 'dl/zero-oid-in-hooks'
2020-09-29  Junio C HamanoMerge branch 'jk/make-protocol-v2-the-default'
2020-09-29  Junio C HamanoMerge branch 'bc/clone-with-git-default-hash-fix'
2020-09-29  Junio C HamanoMerge branch 'tb/bloom-improvements'
2020-09-29  Junio C HamanoMerge branch 'bc/faq-misc'
2020-09-25  Junio C HamanoMerge branch 'jk/diff-highlight-blank-match-fix'
2020-09-25  Junio C HamanoMerge branch 'hx/push-atomic-with-cert'
2020-09-25  Junio C HamanoMerge branch 'rs/misc-cleanups'
2020-09-25  Junio C HamanoMerge branch 'ld/p4-unshelve-fix'
2020-09-25  Junio C HamanoMerge branch 'jx/proc-receive-hook'
2020-09-25  Junio C HamanoMerge branch 'ds/maintenance-part-1'
2020-09-22  Junio C HamanoMerge branch 'ar/fetch-ipversion-in-all'
2020-09-22  Junio C HamanoMerge branch 'cs/don-t-pretend-a-failed-remote-set...
2020-09-22  Junio C HamanoMerge branch 'jk/dont-count-existing-objects-twice'
2020-09-22  Junio C HamanoMerge branch 'cd/commit-graph-doc'
2020-09-22  Junio C HamanoMerge branch 'ls/mergetool-meld-auto-merge'
2020-09-22  Junio C HamanoMerge branch 'pw/add-p-edit-ita-path'
2020-09-22  Junio C HamanoMerge branch 'hn/refs-trace-backend'
2020-09-22  Junio C HamanoMerge branch 'jt/threaded-index-pack'
2020-09-22  Junio C HamanoMerge branch 'es/format-patch-interdiff-cleanup'
2020-09-22  Junio C HamanoMerge branch 'os/fetch-submodule-optim'
2020-09-19  Junio C HamanoMerge branch 'mt/config-fail-nongit-early'
2020-09-19  Junio C HamanoMerge branch 'jc/dist-tarball-tweak'
2020-09-19  Junio C HamanoMerge branch 'mf/submodule-summary-with-correct-repository'
2020-09-19  Junio C HamanoMerge branch 'jc/quote-path-cleanup'
2020-09-19  Junio C HamanoMerge branch 'os/collect-changed-submodules-optim'
2020-09-19  Junio C HamanoMerge branch 'es/wt-add-detach'
2020-09-19  Junio C HamanoMerge branch 'jk/add-i-fixes'
2020-09-19  Junio C HamanoMerge branch 'pw/add-p-leakfix'
2020-09-19  Junio C HamanoMerge branch 'jc/add-i-use-builtin-experimental'
2020-09-19  Junio C HamanoMerge branch 'al/t3200-back-on-a-branch'
2020-09-19  Junio C HamanoMerge branch 'hn/refs-ref-log-only-bit'
2020-09-19  Junio C HamanoMerge branch 'ea/blame-use-oideq'
2020-09-19  Junio C HamanoMerge branch 'pb/clang-json-compilation-database'
2020-09-19  Junio C HamanoMerge branch 'so/log-tree-diff-cleanup'
2020-09-19  Junio C HamanoMerge branch 'rs/parallel-read-cache-fix'
2020-09-19  Junio C HamanoMerge branch 'rs/refspec-leakfix'
2020-09-19  Junio C HamanoMerge branch 'rs/misc-cleanups'
2020-09-17  Derrick Stoleemaintenance: replace run_auto_gc()
2020-09-09  Junio C HamanoMerge branch 'os/vcbuild'
2020-09-09  Junio C HamanoMerge branch 'jt/interpret-branch-name-fallback'
2020-09-09  Junio C HamanoMerge branch 'pb/imap-send-updates'
2020-09-09  Junio C HamanoMerge branch 'hv/ref-filter-misc'
2020-09-09  Junio C HamanoMerge branch 'ss/submodule-summary-in-c-fixes'
2020-09-09  Junio C HamanoMerge branch 'so/separate-field-for-m-and-diff-merges'
2020-09-09  Junio C HamanoMerge branch 'es/worktree-repair'
2020-09-09  Junio C HamanoMerge branch 'jk/worktree-check-clean-leakfix'
2020-09-09  Junio C HamanoMerge branch 'tb/repack-clearing-midx'
2020-09-09  Junio C HamanoMerge branch 'ss/submodule-summary-in-c'
2020-09-03  Junio C HamanoMerge branch 'pb/doc-external-diff-env'
2020-09-03  Junio C HamanoMerge branch 'jk/xrealloc-avoid-use-after-free'
2020-09-03  Junio C HamanoMerge branch 'jc/post-checkout-doc'
2020-09-03  Junio C HamanoMerge branch 'pb/doc-sequence-editor-configuration'
2020-09-03  Junio C HamanoMerge branch 'hl/bisect-doc-clarify-bad-good-ordering'
2020-09-03  Junio C HamanoMerge branch 'so/pretty-abbrev-doc'
2020-09-03  Junio C HamanoMerge branch 'mr/diff-hide-stat-wo-textual-change'
2020-09-03  Junio C HamanoMerge branch 'jt/lazy-fetch'
2020-09-03  Junio C HamanoMerge branch 'jc/run-command-use-embedded-args'
2020-09-03  Junio C HamanoMerge branch 'jc/undash-in-tree-git-callers'
2020-09-03  Junio C HamanoMerge branch 'jk/slimmed-down'
2020-09-03  Junio C HamanoMerge branch 'pw/add-p-allowed-options-fix'
2020-09-03  Junio C HamanoMerge branch 'jt/fetch-pack-loosen-validation-with...
2020-09-03  Junio C HamanoMerge branch 'ss/t7401-modernize'
2020-09-03  Junio C HamanoMerge branch 'pw/rebase-i-more-options'
2020-09-02  Jonathan Tanwt-status: tolerate dangling marks
2020-08-31  Junio C HamanoMerge branch 'ps/ref-transaction-hook'
2020-08-31  Junio C HamanoMerge branch 'jk/rev-input-given-fix'
2020-08-31  Junio C HamanoMerge branch 'jc/ident-whose-ident'
2020-08-31  Junio C HamanoMerge branch 'rp/apply-cached-doc'
next