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

2020-03-17	Junio C Hamano	Merge branch 'jk/push-option-doc-markup-fix' into maint	blob \| commitdiff \| raw
2020-03-17	Junio C Hamano	Merge branch 'jk/doc-diff-parallel' into maint	blob \| commitdiff \| raw
2020-03-17	Junio C Hamano	Merge branch 'jh/notes-fanout-fix' into maint	blob \| commitdiff \| raw
2020-03-17	Junio C Hamano	Merge branch 'jk/index-pack-dupfix' into maint	blob \| commitdiff \| raw
2020-03-17	Junio C Hamano	Merge branch 'js/builtin-add-i-cmds' into maint	blob \| commitdiff \| raw
2020-03-11	Junio C Hamano	Merge branch 'ds/sparse-add'	blob \| commitdiff \| raw
2020-03-11	Junio C Hamano	Merge branch 'jc/doc-single-h-is-for-help'	blob \| commitdiff \| raw
2020-03-09	Junio C Hamano	Merge branch 'hd/show-one-mergetag-fix'	blob \| commitdiff \| raw
2020-03-09	Junio C Hamano	Merge branch 'am/mingw-poll-fix'	blob \| commitdiff \| raw
2020-03-05	Junio C Hamano	Merge branch 'hi/gpg-use-check-signature'	blob \| commitdiff \| raw
2020-03-05	Junio C Hamano	Merge branch 'rs/commit-graph-code-simplification'	blob \| commitdiff \| raw
2020-03-05	Junio C Hamano	Merge branch 'ds/sparse-add'	blob \| commitdiff \| raw
2020-03-02	Junio C Hamano	Merge branch 'rs/blame-typefix-for-fingerprint'	blob \| commitdiff \| raw
2020-03-02	Junio C Hamano	Merge branch 'es/worktree-cleanup'	blob \| commitdiff \| raw
2020-03-02	Junio C Hamano	Merge branch 'jk/run-command-formatfix'	blob \| commitdiff \| raw
2020-03-02	Junio C Hamano	Merge branch 'en/check-ignore'	blob \| commitdiff \| raw
2020-03-02	Junio C Hamano	Merge branch 'jk/push-option-doc-markup-fix'	blob \| commitdiff \| raw
2020-03-02	Junio C Hamano	Merge branch 'jk/doc-diff-parallel'	blob \| commitdiff \| raw
2020-02-17	Junio C Hamano	Merge branch 'js/mingw-open-in-gdb'	blob \| commitdiff \| raw
2020-02-17	Junio C Hamano	Merge branch 'js/test-unc-fetch'	blob \| commitdiff \| raw
2020-02-17	Junio C Hamano	Merge branch 'js/test-avoid-pipe'	blob \| commitdiff \| raw
2020-02-17	Junio C Hamano	Merge branch 'js/test-write-junit-xml-fix'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jk/index-pack-dupfix'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jh/notes-fanout-fix'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'pk/status-of-uncloned-submodule'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'ds/sparse-checkout-harden'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'dl/test-must-fail-fixes-2'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'ag/rebase-avoid-unneeded-checkout'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jn/promote-proto2-to-default'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jk/packfile-reuse-cleanup'	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'js/convert-typofix' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jb/multi-pack-index-docfix' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'ma/diff-doc-clarify-regexp-example' into...	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'ms/doc-bundle-format' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'es/submodule-fetch-message-fix' into...	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'km/submodule-doc-use-sm-path' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'ds/refmap-doc' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'bc/actualmente' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jk/test-fixes' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jk/asan-build-fix' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'ds/sparse-cone' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'nd/switch-and-restore' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jk/no-flush-upon-disconnecting-slrpc...	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'hw/tutorial-favor-switch-over-checkout...	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'es/unpack-trees-oob-fix' into maint	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'bc/run-command-nullness-after-free-fix...	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'en/string-list-can-be-custom-sorted'...	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'jt/sha1-file-remove-oi-skip-cached' into...	blob \| commitdiff \| raw
2020-02-14	Junio C Hamano	Merge branch 'hw/commit-advise-while-rejecting' into...	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'js/convert-typofix'	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'jb/multi-pack-index-docfix'	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'ma/diff-doc-clarify-regexp-example'	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'ms/doc-bundle-format'	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'es/submodule-fetch-message-fix'	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'km/submodule-doc-use-sm-path'	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'jk/escaped-wildcard-dwim'	blob \| commitdiff \| raw
2020-02-12	Junio C Hamano	Merge branch 'jn/pretend-object-doc'	blob \| commitdiff \| raw
2020-02-05	Junio C Hamano	Merge branch 'bc/hash-independent-tests-part-7'	blob \| commitdiff \| raw
2020-02-05	Junio C Hamano	Merge branch 'am/checkout-file-and-ref-ref-ambiguity'	blob \| commitdiff \| raw
2020-02-05	Junio C Hamano	Merge branch 'js/add-p-leftover-bits'	blob \| commitdiff \| raw
2020-02-05	Junio C Hamano	Merge branch 'js/patch-mode-in-others-in-c'	blob \| commitdiff \| raw
2020-02-05	Junio C Hamano	Merge branch 'dl/test-must-fail-fixes'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'lh/bool-to-type-bool'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'ds/refmap-doc'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'bc/actualmente'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'js/builtin-add-i-cmds'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'jk/test-fixes'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'jk/asan-build-fix'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'sg/completion-worktree'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'jn/test-lint-one-shot-export-to-shell...	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'hi/gpg-mintrustlevel'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'ds/sparse-cone'	blob \| commitdiff \| raw
2020-01-30	Junio C Hamano	Merge branch 'hi/indent-text-with-tabs-in-editorconfig'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'nd/switch-and-restore'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'jk/no-flush-upon-disconnecting-slrpc...	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'hw/tutorial-favor-switch-over-checkout'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'es/unpack-trees-oob-fix'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'bc/run-command-nullness-after-free-fix'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'en/string-list-can-be-custom-sorted'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'en/simplify-check-updates-in-unpack-trees'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'jt/sha1-file-remove-oi-skip-cached'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'hw/commit-advise-while-rejecting'	blob \| commitdiff \| raw
2020-01-22	Junio C Hamano	Merge branch 'dl/credential-netrc'	blob \| commitdiff \| raw
2020-01-16	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2020-01-12	Junio C Hamano	Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git...	blob \| commitdiff \| raw
2020-01-10	Junio C Hamano	Merge branch 'js/mingw-loosen-overstrict-tree-entry...	blob \| commitdiff \| raw
2020-01-10	Junio C Hamano	Merge branch 'ma/config-advice-markup-fix'	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge branch 'ds/graph-assert-fix'	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge branch 'tm/doc-submodule-absorb-fix'	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge branch 'pm/am-in-body-header-doc-update'	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge branch 'jb/doc-multi-pack-idx-fix'	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge branch 'do/gitweb-typofix-in-comments'	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
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-11-21	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom