Merge branch 'js/t0007-typofix'
[git] / git-gui / lib / merge.tcl
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 'bc/faq'
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.25.4 v2.25.4
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 'bc/filter-process'
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 'ss/submodule-foreach-cb'
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 'ds/check-connected-reprepare-packed-git'
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-21  Junio C HamanoMerge tag 'l10n-2.26.0-rnd2.1' of git://github.com...
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-18  Junio C HamanoGit 2.25.3 v2.25.3
2020-03-17  Junio C HamanoMerge branch 'jk/run-command-formatfix' into maint
2020-03-17  Junio C HamanoMerge branch 'js/mingw-open-in-gdb' into maint
2020-03-17  Junio C HamanoMerge branch 'js/test-unc-fetch' into maint
2020-03-17  Junio C HamanoMerge branch 'js/test-write-junit-xml-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'en/simplify-check-updates-in-unpack-trees...
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 'am/mingw-poll-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'hi/gpg-use-check-signature' into maint
2020-03-17  Junio C HamanoMerge branch 'en/check-ignore' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/push-option-doc-markup-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/doc-diff-parallel' into maint
2020-03-17  Junio C HamanoMerge branch 'jh/notes-fanout-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/index-pack-dupfix' into maint
2020-03-17  Junio C HamanoMerge branch 'js/builtin-add-i-cmds' into maint
2020-03-11  Junio C HamanoMerge branch 'ds/sparse-add'
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-09  Junio C HamanoMerge branch 'am/mingw-poll-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-03-05  Junio C HamanoMerge branch 'ds/sparse-add'
2020-03-02  Junio C HamanoMerge branch 'rs/blame-typefix-for-fingerprint'
2020-03-02  Junio C HamanoMerge branch 'es/worktree-cleanup'
2020-03-02  Junio C HamanoMerge branch 'jk/run-command-formatfix'
2020-03-02  Junio C HamanoMerge branch 'en/check-ignore'
2020-03-02  Junio C HamanoMerge branch 'jk/push-option-doc-markup-fix'
2020-03-02  Junio C HamanoMerge branch 'jk/doc-diff-parallel'
2020-02-17  Junio C HamanoMerge branch 'js/mingw-open-in-gdb'
2020-02-17  Junio C HamanoMerge branch 'js/test-unc-fetch'
2020-02-17  Junio C HamanoMerge branch 'js/test-avoid-pipe'
2020-02-17  Junio C HamanoMerge branch 'js/test-write-junit-xml-fix'
2020-02-14  Junio C HamanoMerge branch 'jk/index-pack-dupfix'
2020-02-14  Junio C HamanoMerge branch 'jh/notes-fanout-fix'
2020-02-14  Junio C HamanoMerge branch 'pk/status-of-uncloned-submodule'
2020-02-14  Junio C HamanoMerge branch 'ds/sparse-checkout-harden'
2020-02-14  Junio C HamanoMerge branch 'dl/test-must-fail-fixes-2'
2020-02-14  Junio C HamanoMerge branch 'ag/rebase-avoid-unneeded-checkout'
2020-02-14  Junio C HamanoMerge branch 'jn/promote-proto2-to-default'
2020-02-14  Junio C HamanoMerge branch 'jk/packfile-reuse-cleanup'
2020-02-14  Junio C HamanoMerge branch 'js/convert-typofix' into maint
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 'ms/doc-bundle-format' into maint
2020-02-14  Junio C HamanoMerge branch 'es/submodule-fetch-message-fix' into...
2020-02-14  Junio C HamanoMerge branch 'km/submodule-doc-use-sm-path' into maint
2020-02-14  Junio C HamanoMerge branch 'ds/refmap-doc' into maint
2020-02-14  Junio C HamanoMerge branch 'bc/actualmente' into maint
2020-02-14  Junio C HamanoMerge branch 'jk/test-fixes' into maint
2020-02-14  Junio C HamanoMerge branch 'jk/asan-build-fix' into maint
2020-02-14  Junio C HamanoMerge branch 'ds/sparse-cone' 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-14  Junio C HamanoMerge branch 'hw/tutorial-favor-switch-over-checkout...
2020-02-14  Junio C HamanoMerge branch 'es/unpack-trees-oob-fix' into maint
2020-02-14  Junio C HamanoMerge branch 'bc/run-command-nullness-after-free-fix...
2020-02-14  Junio C HamanoMerge branch 'en/string-list-can-be-custom-sorted'...
2020-02-14  Junio C HamanoMerge branch 'jt/sha1-file-remove-oi-skip-cached' into...
2020-02-14  Junio C HamanoMerge branch 'hw/commit-advise-while-rejecting' into...
2020-02-12  Junio C HamanoMerge branch 'js/convert-typofix'
2020-02-12  Junio C HamanoMerge branch 'jb/multi-pack-index-docfix'
next