Merge branch 'en/merge-recursive-comment-fixes'
[git] / git-gui / lib / mergetool.tcl
2020-08-04  Junio C HamanoMerge branch 'jt/pretend-object-never-come-from-elsewhere'
2020-07-31  Junio C HamanoMerge branch 'jb/doc-packfile-name' into master
2020-07-30  Junio C HamanoMerge branch 'en/fill-directory-exponential' into master
2020-07-30  Junio C HamanoMerge branch 'ct/mv-unmerged-path-error' into master
2020-07-30  Junio C HamanoMerge branch 'bc/push-cas-cquoted-refname' into master
2020-07-30  Junio C HamanoMerge branch 'rs/add-index-entry-optim-fix' into master
2020-07-30  Junio C HamanoMerge branch 'jk/tests-timestamp-fix' into master
2020-07-30  Junio C HamanoMerge branch 'ds/commit-graph-bloom-updates' into master
2020-07-30  Junio C HamanoMerge branch 'sg/commit-graph-cleanups' into master
2020-07-20  Junio C HamanoMerge https://github.com/prati0100/git-gui into master
2020-07-18  Junio C HamanoMerge branch 'dl/branch-cleanup' into master
2020-07-18  Junio C HamanoMerge branch 'js/pu-to-seen' into master
2020-07-15  Junio C HamanoMerge branch 'tb/commit-graph-no-check-oids' into master
2020-07-15  Junio C HamanoMerge branch 'ct/diff-with-merge-base-clarification...
2020-07-15  Junio C HamanoMerge branch 'sg/commit-graph-progress-fix' into master
2020-07-15  Junio C HamanoMerge branch 'ta/wait-on-aliased-commands-upon-signal...
2020-07-09  Junio C HamanoMerge branch 'mt/entry-fstat-fallback-fix' into master
2020-07-09  Junio C HamanoMerge branch 'ma/rebase-doc-typofix' into master
2020-07-09  Junio C HamanoMerge branch 'tb/fix-persistent-shallow' into master
2020-07-09  Junio C HamanoMerge branch 'ct/diff-with-merge-base-clarification...
2020-07-09  Junio C HamanoMerge branch 'ra/send-email-in-reply-to-from-command...
2020-07-09  Junio C HamanoMerge branch 'cc/cat-file-usage-update' into master
2020-07-07  Junio C HamanoMerge branch 'es/worktree-code-cleanup'
2020-07-07  Junio C HamanoMerge branch 'dl/test-must-fail-fixes-5'
2020-07-07  Junio C HamanoMerge branch 'bc/http-push-flagsfix'
2020-07-07  Junio C HamanoMerge branch 'js/pu-to-seen'
2020-07-07  Junio C HamanoMerge branch 'mk/pb-pretty-email-without-domain-part...
2020-07-07  Junio C HamanoMerge branch 'es/get-worktrees-unsort'
2020-07-07  Junio C HamanoMerge branch 'bc/sha-256-cvs-svn-updates'
2020-07-07  Junio C HamanoMerge branch 'bc/sha-256-part-2'
2020-06-29  Junio C HamanoMerge branch 'rs/commit-reach-leakfix'
2020-06-29  Junio C HamanoMerge branch 'rs/pull-leakfix'
2020-06-29  Junio C HamanoMerge branch 'rs/retire-strbuf-write-fd'
2020-06-29  Junio C HamanoMerge branch 'dl/diff-usage-comment-update'
2020-06-25  Junio C HamanoMerge branch 'pb/t4014-unslave'
2020-06-25  Junio C HamanoMerge branch 'jt/cdn-offload'
2020-06-25  Junio C HamanoMerge branch 'dl/branch-cleanup'
2020-06-25  Junio C HamanoMerge branch 'cc/upload-pack-data-3'
2020-06-25  Junio C HamanoMerge branch 'ct/diff-with-merge-base-clarification'
2020-06-25  Junio C HamanoMerge branch 'jk/complete-git-switch'
2020-06-22  Junio C HamanoMerge branch 'en/sparse-with-submodule-doc'
2020-06-22  Junio C HamanoMerge branch 'es/worktree-duplicate-paths'
2020-06-22  Junio C HamanoMerge branch 'jt/redact-all-cookies'
2020-06-22  Junio C HamanoMerge branch 'cc/upload-pack-data-2'
2020-06-18  Junio C HamanoMerge branch 'es/advertise-contribution-doc'
2020-06-18  Junio C HamanoMerge branch 'dl/python-2.7-is-the-floor-version'
2020-06-18  Junio C HamanoMerge branch 'dl/t-readme-spell-git-correctly'
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-18  Junio C HamanoMerge branch 'js/msvc-build-fix'
2020-06-18  Junio C HamanoMerge branch 'en/sparse-checkout'
2020-06-18  Junio C HamanoMerge branch 'js/reflog-anonymize-for-clone-and-fetch'
2020-06-18  Junio C HamanoMerge branch 'jk/diff-memuse-optim-with-stat-unmatch'
2020-06-12  Junio C HamanoMerge branch 'hn/refs-cleanup'
2020-06-09  Junio C HamanoMerge branch 'jt/curl-verbose-on-trace-curl'
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...
next