git.oblomov.eu Git - git/history - git-gui/lib/mergetool.tcl

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom