Merge branch 'cc/upload-pack-data'
[git] / git-gui / lib / mergetool.tcl
2020-06-09  Junio C HamanoMerge branch 'cc/upload-pack-data'
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 'dl/remote-curl-deadlock-fix'
2020-06-09  Junio C HamanoMerge branch 'bc/filter-process'
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-06-09  Junio C HamanoMerge branch 'tb/commit-graph-no-check-oids'
2020-06-09  Junio C HamanoMerge branch 'cb/t4210-illseq-auto-detect'
2020-06-09  Junio C HamanoMerge branch 'ds/line-log-on-bloom'
2020-06-02  Junio C HamanoMerge branch 'en/fast-import-looser-date'
2020-06-02  Junio C HamanoMerge branch 'la/diff-relative-config'
2020-06-02  Junio C HamanoMerge branch 'lo/sparse-universal-zero-init'
2020-06-02  Junio C HamanoMerge branch 'cb/t5608-cleanup'
2020-06-02  Junio C HamanoMerge branch 'jx/pkt-line-doc-count-fix'
2020-06-02  Junio C HamanoMerge branch 'jn/experimental-opts-into-proto-v2'
2020-06-02  Junio C HamanoMerge branch 'bk/p4-prepare-p4-only-fix'
2020-06-02  Junio C HamanoMerge branch 'an/merge-single-strategy-optim'
2020-05-31  Junio C HamanoMerge branch 'cb/test-use-ere-for-alternation'
2020-05-29  Junio C HamanoMerge branch 'bc/sha-256-part-1-of-4'
2020-05-29  Junio C HamanoMerge branch 'jk/ci-only-on-selected-branches'
2020-05-26  Jiang XinMerge branch 'master' of github.com:git-l10n/git-po
2020-05-26  Junio C HamanoMerge branch 'ss/faq-ignore'
2020-05-25  Junio C HamanoMerge branch 'dd/t5703-grep-a-fix'
2020-05-25  Junio C HamanoMerge branch 'ds/multi-pack-verify'
2020-05-25  Junio C HamanoMerge branch 'ma/doc-fixes'
2020-05-25  Junio C HamanoMerge branch 'cb/bisect-replay-with-dos-fix'
2020-05-25  Junio C HamanoMerge branch 'gs/commit-graph-path-filter'
2020-05-25  Junio C HamanoMerge branch 'dl/merge-autostash'
2020-05-25  Junio C HamanoMerge branch 'bc/faq'
2020-05-25  Junio C HamanoMerge branch 'jt/avoid-prefetch-when-able-in-diff'
2020-05-25  Junio C HamanoMerge branch 'gp/hppa-stack-test-fix'
2020-05-21  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-01-08  Junio C HamanoMerge https://github.com/prati0100/git-gui
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-03-18  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2018-03-06  Junio C HamanoMerge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02  Junio C HamanoMerge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02  Junio C HamanoMerge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-05  Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22  Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-07-25  Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-04-17  Junio C HamanoMerge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-01-18  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2016-10-20  Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26  Junio C HamanoMerge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui
2016-08-31  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix'
2016-07-28  Junio C HamanoMerge branch 'js/t3404-grammo-fix' into maint
2016-07-13  Junio C HamanoMerge branch 'js/t3404-grammo-fix'
2016-07-11  Junio C HamanoMerge branch 'cb/t7810-test-label-fix' into maint
2016-07-06  Junio C HamanoMerge branch 'cb/t7810-test-label-fix'
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18  Junio C HamanoMerge branch 'rn/glossary-typofix' into HEAD
2016-05-17  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix'
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix'
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes'
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string'
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-07-15  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15  Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint
2015-07-01  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator'
2015-06-24  Junio C HamanoMerge branch 'fk/doc-format-patch-vn'
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix'
2015-05-26  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' into...
2015-05-13  Junio C HamanoMerge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long'
2015-05-06  Junio C HamanoMerge branch 'ep/fix-test-lib-functions-report'
2015-04-28  Junio C HamanoMerge branch 'mg/show-notes-doc'
2015-04-21  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14  Junio C HamanoMerge branch 'sb/plug-streaming-leak'
next