Merge branch 'js/ci-github-set-env'
[git] / builtin / merge-tree.c
2020-11-11  Junio C HamanoMerge branch 'js/p4-default-branch'
2020-11-11  Junio C HamanoMerge branch 'js/test-whitespace-fixes'
2020-11-11  Junio C HamanoMerge branch 'mc/typofix'
2020-11-11  Junio C HamanoMerge branch 'jc/abbrev-doc'
2020-11-11  Junio C HamanoMerge branch 'cw/ci-ghwf-check-ws-errors'
2020-11-11  Junio C HamanoMerge branch 'rs/worktree-list-show-locked'
2020-11-11  Junio C HamanoMerge branch 'rs/pack-write-hashwrite-simplify'
2020-11-11  Junio C HamanoMerge branch 'sd/prompt-local-variable'
2020-11-11  Junio C HamanoMerge branch 'rs/clear-commit-marks-in-repo'
2020-11-11  Junio C HamanoMerge branch 'so/format-patch-doc-on-default-diff-format'
2020-11-09  Junio C HamanoMerge branch 'js/default-branch-name-adjust-t5411'
2020-11-09  Junio C HamanoMerge branch 'fc/zsh-completion'
2020-11-09  Junio C HamanoMerge branch 'jk/sideband-more-error-checking'
2020-11-09  Junio C HamanoMerge branch 'jk/committer-date-is-author-date-fix...
2020-11-09  Junio C HamanoMerge branch 'ab/git-remote-exit-code'
2020-11-09  Junio C HamanoMerge branch 'pb/ref-filter-with-crlf'
2020-11-09  Junio C HamanoMerge branch 'jk/checkout-index-errors'
2020-11-09  Junio C HamanoMerge branch 'jk/perl-warning'
2020-11-09  Junio C HamanoMerge branch 'nk/diff-files-vs-fsmonitor'
2020-11-09  Junio C HamanoMerge branch 'as/tests-cleanup'
2020-11-09  Junio C HamanoMerge branch 'en/dir-rename-tests'
2020-11-09  Junio C HamanoMerge branch 'mr/bisect-in-c-3'
2020-11-02  Junio C HamanoMerge branch 'jc/doc-final-resend'
2020-11-02  Junio C HamanoMerge branch 'es/tutorial-mention-asciidoc-early'
2020-11-02  Junio C HamanoMerge branch 'js/default-branch-name-part-4-minus-1'
2020-11-02  Junio C HamanoMerge branch 've/userdiff-bash'
2020-11-02  Junio C HamanoMerge branch 'bc/svn-hash-oid-fix'
2020-11-02  Junio C HamanoMerge branch 'js/t7006-cleanup'
2020-11-02  Junio C HamanoMerge branch 'en/sequencer-rollback-lock-cleanup'
2020-11-02  Junio C HamanoMerge branch 'mk/diff-ignore-regex'
2020-10-20  Michał Kępieńmerge-base, xdiff: zero out xpparam_t structures
2020-10-17  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-10-03  Junio C HamanoMerge remote-tracking branch 'paulus/master' into pm...
2020-07-31  Junio C HamanoMerge branch 'jb/doc-packfile-name' into master
2020-07-20  Junio C HamanoMerge https://github.com/prati0100/git-gui into master
2020-06-09  Junio C HamanoMerge branch 'cb/bisect-helper-parser-fix'
2020-06-09  Junio C HamanoMerge branch 'vs/complete-stash-show-p-fix'
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-14  Junio C HamanoMerge branch 'js/rebase-autosquash-double-fixup-fix'
2020-05-08  Junio C HamanoMerge branch 'cb/t0000-use-the-configured-shell'
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-05  Junio C HamanoMerge branch 'js/partial-urlmatch-2.17'
2020-05-01  Junio C HamanoMerge branch 'ds/multi-pack-index'
2020-04-29  Junio C HamanoSync with js/partial-urlmatch-2.17
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-22  Junio C HamanoMerge branch 'jc/missing-ref-store-fix'
2020-04-22  Junio C HamanoMerge branch 'js/t0007-typofix'
2020-04-22  Junio C HamanoMerge branch 'dl/wrapper-fix-indentation'
2020-04-19  Jonathan NiederGit 2.24.3 v2.24.3
2020-04-19  Jonathan NiederGit 2.23.3 v2.23.3
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-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 HamanoMerge branch 'hd/show-one-mergetag-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'hi/gpg-use-check-signature' into maint
2020-03-17  Junio C HamanoGit 2.24.2 v2.24.2
2020-03-17  Junio C HamanoGit 2.23.2 v2.23.2
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-11  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help'
2020-03-09  Junio C HamanoMerge branch 'hd/show-one-mergetag-fix'
2020-03-05  Junio C HamanoMerge branch 'hi/gpg-use-check-signature'
2020-03-05  Junio C HamanoMerge branch 'rs/commit-graph-code-simplification'
2020-02-14  Junio C HamanoMerge branch 'pk/status-of-uncloned-submodule'
2020-02-14  Junio C HamanoMerge branch 'ag/rebase-avoid-unneeded-checkout'
2020-02-14  Junio C HamanoMerge branch 'jk/packfile-reuse-cleanup'
2020-02-14  Junio C HamanoMerge branch 'jb/multi-pack-index-docfix' into maint
2020-02-14  Junio C HamanoMerge branch 'ma/diff-doc-clarify-regexp-example' into...
2020-02-14  Junio C HamanoMerge branch 'bc/actualmente' into maint
2020-02-14  Junio C HamanoMerge branch 'nd/switch-and-restore' into maint
2020-02-14  Junio C HamanoMerge branch 'jk/no-flush-upon-disconnecting-slrpc...
2020-02-12  Junio C HamanoMerge branch 'jb/multi-pack-index-docfix'
2020-02-12  Junio C HamanoMerge branch 'ma/diff-doc-clarify-regexp-example'
2020-01-30  Junio C HamanoMerge branch 'lh/bool-to-type-bool'
2020-01-30  Junio C HamanoMerge branch 'bc/actualmente'
2020-01-22  Junio C HamanoMerge branch 'nd/switch-and-restore'
2020-01-22  Junio C HamanoMerge branch 'jk/no-flush-upon-disconnecting-slrpc...
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-06  Junio C HamanoMerge branch 'pb/clarify-line-log-doc'
2020-01-06  Junio C HamanoMerge branch 'ew/packfile-syscall-optim'
2020-01-02  Junio C HamanoMerge branch 'js/use-test-tool-on-path'
2019-12-25  Junio C HamanoMerge branch 'rs/xdiff-ignore-ws-w-func-context'
2019-12-25  Junio C HamanoMerge branch 'mr/bisect-use-after-free'
2019-12-25  Junio C HamanoMerge branch 'dl/format-patch-notes-config-fixup'
2019-12-16  Junio C HamanoMerge branch 'rs/commit-export-env-simplify'
2019-12-16  Junio C HamanoMerge branch 'rs/archive-zip-code-cleanup'
2019-12-16  Junio C HamanoMerge branch 'rs/xdiff-ignore-ws-w-func-context'
next