]> git.ipfire.org Git - thirdparty/git.git/history - merge.c
Merge branch 'rs/pull-leakfix'
[thirdparty/git.git] / merge.c
2020-04-28  Junio C HamanoMerge branch 'ds/commit-graph-expiry-fix'
2020-04-28  Junio C HamanoMerge branch 'jc/log-no-mailmap'
2020-04-28  Junio C HamanoMerge branch 'ma/doc-discard-docbook-xsl-1.73'
2020-04-28  Junio C HamanoMerge branch 'lx/submodule-clear-variables'
2020-04-28  Junio C HamanoMerge branch 'jk/fast-import-use-hashmap'
2020-04-28  Junio C HamanoMerge branch 'bc/constant-memequal'
2020-04-28  Junio C HamanoMerge branch 'lr/freshen-file-fix'
2020-04-28  Junio C HamanoMerge branch 'jc/doc-test-leaving-early'
2020-04-28  Junio C HamanoMerge branch 'dd/test-with-busybox'
2020-04-22  Junio C HamanoMerge branch 'jk/credential-parsing-end-of-host-in...
2020-04-22  Junio C HamanoMerge branch 'jt/rebase-allow-duplicate'
2020-04-22  Junio C HamanoMerge branch 'en/rebase-no-keep-empty'
2020-04-22  Junio C HamanoMerge branch 'js/mingw-fixes'
2020-04-22  Junio C HamanoMerge branch 'jc/missing-ref-store-fix'
2020-04-22  Junio C HamanoMerge branch 'ma/config-doc-fix'
2020-04-22  Junio C HamanoMerge branch 'pb/pull-fetch-doc'
2020-04-22  Junio C HamanoMerge branch 'dd/no-gpg-sign'
2020-04-22  Junio C HamanoMerge branch 'js/t0007-typofix'
2020-04-22  Junio C HamanoMerge branch 'en/sequencer-reflog-action'
2020-04-22  Junio C HamanoMerge branch 'jk/use-quick-lookup-in-clone-for-tag...
2020-04-22  Junio C HamanoMerge branch 'ag/rebase-merge-allow-ff-under-abbrev...
2020-04-22  Junio C HamanoMerge branch 'jk/oid-array-cleanups'
2020-04-22  Junio C HamanoMerge branch 'jm/gitweb-fastcgi-utf8'
2020-04-22  Junio C HamanoMerge branch 'jc/allow-strlen-substitution-in-shell...
2020-04-22  Junio C HamanoMerge branch 'en/pull-do-not-rebase-after-fast-forwarding'
2020-04-22  Junio C HamanoMerge branch 'dl/wrapper-fix-indentation'
2020-04-22  Junio C HamanoMerge branch 'rs/pull-options-sync-code-and-doc'
2020-04-22  Junio C HamanoMerge branch 'pb/rebase-doc-typofix'
2020-04-22  Junio C HamanoMerge branch 'jk/p5310-drop-non-bitmap-timing'
2020-04-22  Junio C HamanoMerge branch 'jk/harden-protocol-v2-delim-handling'
2020-04-22  Junio C HamanoMerge branch 'jk/test-cleanup'
2020-04-22  Junio C HamanoMerge branch 'ak/run-command-on-cygwin-fix'
2020-04-22  Junio C HamanoMerge branch 'dr/midx-avoid-int-underflow'
2020-04-22  Junio C HamanoMerge branch 'dl/test-must-fail-fixes-3'
2020-04-22  Junio C HamanoMerge branch 'js/trace2-env-vars'
2020-04-22  Junio C HamanoMerge branch 'jt/connectivity-check-optim-in-partial...
2020-04-22  Junio C HamanoMerge branch 'bc/faq'
2020-04-22  Junio C HamanoMerge branch 'bk/p4-pre-edit-changelist'
2020-04-22  Junio C HamanoMerge branch 'mt/test-lib-bundled-short-options'
2020-04-22  Junio C HamanoMerge branch 'js/import-tars-do-not-make-phony-files...
2020-04-22  Junio C HamanoMerge branch 'js/test-junit-finalization-fix'
2020-04-22  Junio C HamanoMerge branch 'js/tests-gpg-integration-on-windows'
2020-04-22  Junio C HamanoMerge branch 'jk/t3419-drop-expensive-tests'
2020-04-22  Junio C HamanoMerge branch 'ds/doc-clone-filter'
2020-04-22  Junio C HamanoMerge branch 'ar/test-style-fixes'
2020-04-20  Junio C HamanoSync with 2.26.2
2020-04-19  Jonathan NiederGit 2.21.3 v2.21.3
2020-04-19  Jonathan NiederGit 2.20.4 v2.20.4
2020-04-19  Jonathan NiederGit 2.19.5 v2.19.5
2020-04-19  Jonathan NiederGit 2.18.4 v2.18.4
2020-04-14  Junio C HamanoSync with v2.26.1
2020-04-08  Junio C HamanoMerge branch 'dd/ci-musl-libc' into HEAD
2020-04-08  Junio C HamanoMerge branch 'dd/test-with-busybox' into HEAD
2020-03-29  Junio C HamanoMerge branch 'ds/default-pack-use-sparse-to-true'
2020-03-27  Junio C HamanoMerge branch 'ah/force-pull-rebase-configuration'
2020-03-27  Junio C HamanoMerge branch 'tg/retire-scripted-stash'
2020-03-27  Junio C HamanoMerge branch 'jc/describe-misnamed-annotated-tag'
2020-03-27  Junio C HamanoMerge branch 'at/rebase-fork-point-regression-fix'
2020-03-27  Junio C HamanoMerge branch 'bc/filter-process'
2020-03-25  Junio C HamanoMerge branch 'en/oidset-uninclude-hashmap'
2020-03-25  Junio C HamanoMerge branch 'sg/commit-slab-clarify-peek'
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-17  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help' into maint
2020-03-17  Junio C HamanoGit 2.21.2 v2.21.2
2020-03-17  Junio C HamanoGit 2.20.3 v2.20.3
2020-03-17  Junio C HamanoGit 2.19.4 v2.19.4
2020-03-17  Junio C HamanoGit 2.18.3 v2.18.3
2020-03-16  brian m. carlsonbuiltin/checkout: compute checkout metadata for checkouts
2020-03-11  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help'
2020-02-14  Junio C HamanoMerge branch 'bc/actualmente' into maint
2020-01-30  Junio C HamanoMerge branch 'bc/actualmente'
2020-01-08  Junio C HamanoMerge branch 'tm/doc-submodule-absorb-fix'
2020-01-08  Junio C HamanoMerge branch 'jb/doc-multi-pack-idx-fix'
2020-01-08  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-01-02  Junio C HamanoMerge branch 'js/use-test-tool-on-path'
2019-12-06  Johannes SchindelinSync with 2.20.2
2019-12-06  Johannes SchindelinSync with 2.19.3
2019-12-06  Johannes SchindelinSync with 2.18.2
2019-12-06  Johannes SchindelinSync with 2.17.3
2019-12-06  Johannes SchindelinSync with 2.16.6
2019-12-06  Johannes SchindelinSync with 2.15.4
2019-11-04  Junio C HamanoMerge https://github.com/prati0100/git-gui
2019-10-09  Junio C HamanoMerge branch 'as/shallow-slab-use-fix'
2019-10-07  Junio C HamanoMerge branch 'jk/list-objects-optim-wo-trees'
2019-09-30  Junio C HamanoMerge branch 'tg/push-all-in-mirror-forbidden'
2019-09-18  Junio C HamanoMerge branch 'master' of https://github.com/prati0100...
2019-09-17  Junio C HamanoMerge gitk to pick up emergency build fix
2019-09-16  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2019-09-09  Junio C HamanoMerge branch 'mp/for-each-ref-missing-name-or-email'
2019-09-09  Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-08-09  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index...
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github...
2019-07-29  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index'
2019-07-29  Junio C HamanoMerge branch 'bb/grep-pcre2-bug-message-fix'
2019-07-29  Junio C HamanoMerge branch 'fc/fetch-with-import-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'pw/add-p-recount' into maint
2019-07-29  Junio C HamanoMerge branch 'jk/trailers-use-config' into maint
2019-07-29  Junio C HamanoMerge branch 'ms/submodule-foreach-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'js/rebase-reschedule-applies-only-to...
2019-07-29  Junio C HamanoMerge branch 'jc/denoise-rm-to-resolve' into maint
next