Merge branch 'js/diff-files-i-t-a-fix-for-difftool'
[git] / t / t6020-merge-df.sh
2020-07-07  Junio C HamanoMerge branch 'mk/pb-pretty-email-without-domain-part...
2020-06-29  Junio C HamanoMerge branch 'rs/retire-strbuf-write-fd'
2020-06-18  Junio C HamanoMerge branch 'js/fuzz-commit-graph-leakfix'
2020-06-18  Junio C HamanoMerge branch 'en/do-match-pathspec-fix'
2020-06-09  Junio C HamanoMerge branch 'cb/bisect-helper-parser-fix'
2020-06-09  Junio C HamanoMerge branch 'js/checkout-p-new-file'
2020-06-09  Junio C HamanoMerge branch 'vs/complete-stash-show-p-fix'
2020-06-09  Junio C HamanoMerge branch 'rs/fsck-duplicate-names-in-trees'
2020-06-09  Junio C HamanoMerge branch 'es/bugreport-shell'
2020-05-29  Junio C HamanoMerge branch 'bc/sha-256-part-1-of-4'
2020-05-25  Junio C HamanoMerge branch 'ds/multi-pack-verify'
2020-05-21  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-05-20  Junio C HamanoMerge branch 'es/bugreport'
2020-05-20  Junio C HamanoMerge branch 'cb/no-more-gmtime'
2020-05-14  Junio C HamanoMerge branch 'jt/t5500-unflake'
2020-05-14  Junio C HamanoMerge branch 'rs/fsck-duplicate-names-in-trees'
2020-05-14  Junio C HamanoMerge branch 'js/rebase-autosquash-double-fixup-fix'
2020-05-14  Junio C HamanoMerge branch 'es/bugreport-with-hooks'
2020-05-08  Junio C HamanoMerge branch 'cb/t0000-use-the-configured-shell'
2020-05-08  Junio C HamanoMerge branch 'cb/avoid-colliding-with-netbsd-hmac'
2020-05-08  Junio C HamanoMerge branch 'jk/for-each-ref-multi-key-sort-fix'
2020-05-08  Junio C HamanoMerge branch 'cb/credential-store-ignore-bogus-lines'
2020-05-08  Junio C HamanoMerge branch 'dl/switch-c-option-in-error-message'
2020-05-05  Junio C HamanoMerge branch 'js/partial-urlmatch-2.17'
2020-05-05  Junio C HamanoMerge branch 'bc/wildcard-credential'
2020-05-01  Junio C HamanoMerge branch 'jt/v2-fetch-nego-fix'
2020-05-01  Junio C HamanoMerge branch 'js/anonymise-push-url-in-errors'
2020-05-01  Junio C HamanoMerge branch 'es/bugreport'
2020-05-01  Junio C HamanoMerge branch 'ds/multi-pack-index'
2020-05-01  Junio C HamanoMerge branch 'tb/commit-graph-fd-exhaustion-fix'
2020-05-01  Junio C HamanoMerge branch 'tb/commit-graph-split-strategy'
2020-04-29  Junio C HamanoMerge branch 'en/fill-directory-exponential'
2020-04-29  Junio C HamanoSync with js/partial-urlmatch-2.17
2020-04-28  Junio C HamanoMerge branch 'jn/demote-proto2-from-default'
2020-04-28  Junio C HamanoMerge branch 'ms/doc-revision-illustration-fix'
2020-04-28  Junio C HamanoMerge branch 'tb/diff-tree-with-notes'
2020-04-28  Junio C HamanoMerge branch 'js/subtree-doc-update-to-asciidoctor-2'
2020-04-28  Junio C HamanoMerge branch 'ds/t5319-touch-fix'
2020-04-28  Junio C HamanoMerge branch 'ds/commit-graph-expiry-fix'
2020-04-28  Junio C HamanoMerge branch 'lx/submodule-clear-variables'
2020-04-28  Junio C HamanoMerge branch 'bc/constant-memequal'
2020-04-28  Junio C HamanoMerge branch 'lr/freshen-file-fix'
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 'js/t0007-typofix'
2020-04-22  Junio C HamanoMerge branch 'jk/use-quick-lookup-in-clone-for-tag...
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 'jt/connectivity-check-optim-in-partial...
2020-04-22  Junio C HamanoMerge branch 'bk/p4-pre-edit-changelist'
2020-04-22  Junio C HamanoMerge branch 'jk/t3419-drop-expensive-tests'
2020-04-19  Jonathan NiederGit 2.26.2 v2.26.2
2020-04-19  Jonathan NiederGit 2.19.5 v2.19.5
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 'hi/gpg-prefer-check-signature'
2020-03-27  Junio C HamanoMerge branch 'bc/sha-256-part-1-of-4'
2020-03-27  Junio C HamanoMerge branch 'pb/recurse-submodules-fix'
2020-03-25  Junio C HamanoMerge branch 'jc/config-tar'
2020-03-25  Junio C HamanoMerge branch 'en/oidset-uninclude-hashmap'
2020-03-25  Junio C HamanoMerge branch 'rs/doc-passthru-fetch-options'
2020-03-25  Junio C HamanoMerge branch 'pw/advise-rebase-skip'
2020-03-25  Junio C HamanoMerge branch 'yz/p4-py3'
2020-03-25  Junio C HamanoMerge branch 'am/real-path-fix'
2020-03-25  Junio C HamanoMerge branch 'sg/commit-slab-clarify-peek'
2020-03-25  Junio C HamanoMerge branch 'jc/maintain-doc'
2020-03-25  Junio C HamanoMerge branch 'js/https-proxy-config'
2020-03-25  Junio C HamanoMerge branch 'hw/advise-ng'
2020-03-25  Junio C HamanoGit 2.26.1 v2.26.1
2020-03-21  Junio C HamanoMerge branch 'en/rebase-backend'
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-17  Junio C HamanoSync with Git 2.25.2
2020-03-17  Junio C HamanoGit 2.19.4 v2.19.4
2020-03-16  Junio C HamanoMerge branch 'es/outside-repo-errmsg-hints'
2020-03-12  Junio C HamanoMerge branch 'en/rebase-backend'
2020-03-11  Junio C HamanoMerge branch 'ds/sparse-add'
2020-03-11  Junio C HamanoMerge branch 'dr/push-remote-ref-update'
2020-03-11  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help'
2020-03-11  Jiang XinMerge branch 'master' of github.com:git/git into git...
2020-03-09  Junio C HamanoMerge branch 'rs/show-progress-in-dumb-http-fetch'
2020-03-09  Junio C HamanoMerge branch 'hd/show-one-mergetag-fix'
2020-03-09  Junio C HamanoMerge branch 'rt/format-zero-length-fix'
2020-03-09  Junio C HamanoMerge branch 'am/mingw-poll-fix'
2020-03-09  Junio C HamanoMerge branch 'en/test-cleanup'
2020-02-27  Elijah Newrent6020: new test with interleaved lexicographic ordering...
2020-02-27  Elijah Newrent6020, t6022, t6035: update merge tests to use test...
2020-01-08  Junio C HamanoMerge https://github.com/prati0100/git-gui
2019-12-06  Johannes SchindelinSync with 2.18.2
2019-11-04  Junio C HamanoMerge https://github.com/prati0100/git-gui
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-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github...
2019-07-29  Junio C HamanoMerge branch 'pw/add-p-recount' into maint
next