]> git.ipfire.org Git - thirdparty/git.git/history - git-mergetool.sh
Merge branch 'bc/smart-http-atomic-push'
[thirdparty/git.git] / git-mergetool.sh
2019-10-15  Junio C HamanoMerge branch 'tg/range-diff-output-update'
2019-10-11  Junio C HamanoMerge branch 'cb/pcre1-cleanup'
2019-10-11  Junio C HamanoMerge branch 'ab/pcre-jit-fixes'
2019-10-11  Junio C HamanoMerge branch 'pw/rebase-i-show-HEAD-to-reword'
2019-10-11  Junio C HamanoMerge branch 'en/clean-nested-with-ignored'
2019-10-09  Junio C HamanoMerge branch 'rs/convert-fix-utf-without-dash'
2019-10-09  Junio C HamanoMerge branch 'js/mingw-spawn-with-spaces-in-path'
2019-10-09  Junio C HamanoMerge branch 'as/shallow-slab-use-fix'
2019-10-07  Junio C HamanoMerge branch 'cc/multi-promisor'
2019-10-07  Junio C HamanoMerge branch 'rs/nth-parent-parse'
2019-10-07  Junio C HamanoMerge branch 'dl/submodule-set-branch'
2019-10-07  Junio C HamanoMerge branch 'jk/list-objects-optim-wo-trees'
2019-10-06  Junio C HamanoMerge branch 'cb/skip-utf8-check-with-pcre1'
2019-10-06  Junio C HamanoMerge branch 'ma/asciidoctor-refmiscinfo'
2019-09-30  Junio C HamanoMerge branch 'ds/include-exclude'
2019-09-30  Junio C HamanoMerge branch 'sg/clean-nested-repo-with-ignored'
2019-09-30  Junio C HamanoMerge branch 'en/merge-options-ff-and-friends'
2019-09-30  Junio C HamanoMerge branch 'tg/push-all-in-mirror-forbidden'
2019-09-30  Junio C HamanoMerge branch 'dt/remote-helper-doc-re-lock-option'
2019-09-30  Junio C HamanoMerge branch 'rs/help-unknown-ref-does-not-return'
2019-09-30  Junio C HamanoMerge branch 'nd/switch-and-restore'
2019-09-30  Junio C HamanoMerge branch 'mh/notes-duplicate-entries'
2019-09-30  Junio C HamanoMerge branch 'tb/banned-vsprintf-namefix'
2019-09-30  Junio C HamanoMerge branch 'mh/release-commit-memory-fix'
2019-09-30  Junio C HamanoMerge branch 'mh/http-urlmatch-cleanup'
2019-09-30  Junio C HamanoMerge branch 'rs/trace2-dst-warning'
2019-09-30  Junio C HamanoMerge branch 'jc/test-cleanup'
2019-09-18  Junio C HamanoMerge branch 'md/list-objects-filter-combo'
2019-09-18  Junio C HamanoMerge branch 'cc/multi-promisor'
2019-09-18  Junio C HamanoMerge branch 'sg/line-log-tree-diff-optim'
2019-09-18  Junio C HamanoMerge branch 'js/rebase-r-strategy'
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 'bc/reread-attributes-during-rebase'
2019-09-09  Junio C HamanoMerge branch 'mp/for-each-ref-missing-name-or-email'
2019-09-09  Junio C HamanoMerge branch 'rs/sort-oid-array-thread-safe'
2019-09-09  Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-09-09  Junio C HamanoMerge branch 'jt/diff-lazy-fetch-submodule-fix'
2019-09-09  Junio C HamanoMerge branch 'ds/midx-expire-repack'
2019-09-09  Junio C HamanoMerge branch 'rs/pax-extended-header-length-fix'
2019-09-09  Junio C HamanoMerge branch 'bm/repository-layout-typofix'
2019-09-09  Junio C HamanoMerge branch 'en/checkout-mismerge-fix'
2019-09-09  Junio C HamanoMerge branch 'sg/diff-indent-heuristic-non-experimental'
2019-08-22  Junio C HamanoMerge branch 'en/fast-import-merge-doc'
2019-08-22  Junio C HamanoMerge branch 'rs/nedalloc-fixlets'
2019-08-22  Junio C HamanoMerge branch 'sg/show-failed-test-names'
2019-08-22  Junio C HamanoMerge branch 'sc/pack-refs-deletion-racefix'
2019-08-22  Junio C HamanoMerge branch 'jk/tree-walk-overflow'
2019-08-22  Junio C HamanoMerge branch 'mt/grep-submodules-working-tree'
2019-08-12  Junio C HamanoSync with Git 2.22.1
2019-08-09  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index...
2019-08-09  Junio C HamanoMerge branch 'bc/hash-independent-tests-part-4'
2019-08-09  Junio C HamanoMerge branch 'mt/dir-iterator-updates'
2019-08-09  Junio C HamanoMerge branch 'ds/commit-graph-incremental'
2019-08-08  Junio C HamanoMerge branch 'en/disable-dir-rename-in-recursive-merge'
2019-08-08  Junio C HamanoMerge branch 'nd/switch-and-restore'
2019-08-08  Junio C HamanoMerge branch 'mr/doc-can-not-to-cannot'
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github...
2019-08-02  Junio C HamanoMerge branch 'sg/fsck-config-in-doc'
2019-08-01  Junio C HamanoMerge branch 'jc/dir-iterator-test-fix'
2019-08-01  Junio C HamanoMerge branch 'bc/hash-independent-tests-part-4'
2019-08-01  Junio C HamanoSync with maint
2019-07-31  Junio C HamanoMerge branch 'cb/xdiff-no-system-includes-in-dot-c'
2019-07-31  Junio C HamanoMerge branch 'jk/no-system-includes-in-dot-c'
2019-07-30  Jiang XinMerge tag 'v2.23.0-rc0' of git://git.kernel.org/pub...
2019-07-29  Junio C HamanoSync with maint
2019-07-29  Junio C HamanoMerge branch 'js/rebase-cleanup'
2019-07-29  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index'
2019-07-29  Junio C HamanoMerge branch 'sg/travis-gcc-4.8'
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 'ds/close-object-store' 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 'pw/rebase-abort-clean-rewritten' into...
2019-07-29  Junio C HamanoMerge branch 'nd/completion-no-cache-failure' into...
2019-07-29  Junio C HamanoMerge branch 'jk/delta-islands-progress-fix' 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
2019-07-29  Junio C HamanoMerge branch 'sr/gpg-interface-stop-at-the-end' into...
2019-07-29  Junio C HamanoMerge branch 'po/doc-branch' into maint
2019-07-29  Junio C HamanoMerge branch 'dl/config-alias-doc' into maint
2019-07-29  Junio C HamanoMerge branch 'cb/fsmonitor-intfix' into maint
2019-07-29  Junio C HamanoMerge branch 'js/t3404-typofix' into maint
2019-07-29  Junio C HamanoMerge branch 'jt/t5551-test-chunked' into maint
2019-07-29  Junio C HamanoMerge branch 'rm/gpg-program-doc-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'js/unmap-before-ext-diff' into maint
2019-07-25  Junio C HamanoSync with maint
2019-07-25  Junio C HamanoMerge branch 'ab/hash-object-doc' into maint
2019-07-25  Junio C HamanoMerge branch 'cm/send-email-document-req-modules' into...
2019-07-25  Junio C HamanoMerge branch 'sw/git-p4-unshelve-branched-files' into...
2019-07-25  Junio C HamanoMerge branch 'js/bisect-helper-check-get-oid-return...
2019-07-25  Junio C HamanoMerge branch 'es/git-debugger-doc' into maint
2019-07-25  Junio C HamanoMerge branch 'md/url-parse-harden' into maint
2019-07-25  Junio C HamanoMerge branch 'an/ignore-doc-update' into maint
2019-07-25  Junio C HamanoMerge branch 'md/list-objects-filter-memfix' into maint
2019-07-25  Junio C HamanoMerge branch 'jt/partial-clone-missing-ref-delta-base...
2019-07-25  Junio C HamanoMerge branch 'pb/request-pull-verify-remote-ref' into...
next