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

2016-10-20	Junio C Hamano	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2016-10-17	Junio C Hamano	Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com...	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'sb/submodule-config-doc-drop-path'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'rs/pretty-format-color-doc-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'js/reset-usage'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'rs/cocci'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'js/regexec-buf'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'jk/ref-symlink-loop'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'nd/commit-p-doc'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'jk/clone-copy-alternates-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'dt/http-empty-auth'	blob \| commitdiff \| raw \| diff to current
2016-10-11	Junio C Hamano	Merge branch 'jk/verify-packfile-gently' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-11	Junio C Hamano	Merge branch 'jc/worktree-config' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-11	Junio C Hamano	Merge branch 'jc/verify-loose-object-header' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-11	Junio C Hamano	Merge branch 'rs/git-gui-use-modern-git-merge-syntax...	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'jc/blame-reverse'	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'nd/shallow-deepen'	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'cp/completion-negative-refs'	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'dp/autoconf-curl-ssl'	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'ak/curl-imap-send-explicit-scheme'	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'jk/pack-objects-optim-mru'	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'rs/qsort'	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'sg/ref-filter-parse-optim'	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'rs/cocci'	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'rs/c-auto-resets-attributes'	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'ps/http-gssapi-cred-delegation'	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'jk/graph-padding-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'jc/blame-abbrev'	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'vn/revision-shorthand-for-side-branch...	blob \| commitdiff \| raw \| diff to current
2016-10-06	Junio C Hamano	Merge branch 'jk/ambiguous-short-object-names'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Sync with 2.10.1	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'pb/rev-list-reverse-with-count'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'dt/tree-fsck'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'kd/mailinfo-quoted-string'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'mh/diff-indent-heuristic'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'dt/mailinfo'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'va/git-gui-i18n'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'rs/git-gui-use-modern-git-merge-syntax'	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-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
2015-12-21	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	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 'sg/t3020-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-08-26	Junio C Hamano	Merge branch 'sg/t3020-typofix'	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-11	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long'	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-03-24	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| commitdiff \| raw \| diff to current
2015-02-17	Junio C Hamano	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'rw/apply-does-not-take-ignore-date' into...	blob \| commitdiff \| raw \| diff to current
2014-12-22	Junio C Hamano	Merge branch 'rw/apply-does-not-take-ignore-date'	blob \| commitdiff \| raw \| diff to current
2014-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-10-29	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix' into...	blob \| commitdiff \| raw \| diff to current
2014-10-14	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix'	blob \| commitdiff \| raw \| diff to current
2014-09-30	Junio C Hamano	Merge branch 'sb/merge-recursive-copy-paste-fix'	blob \| commitdiff \| raw \| diff to current
2014-09-26	Junio C Hamano	Merge branch 'sb/help-unknown-command-sort-fix'	blob \| commitdiff \| raw \| diff to current
2014-08-10	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-27	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge early parts from git://ozlabs.org/~paulus/gitk.git	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| raw \| diff to current
2014-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-01-21	Junio C Hamano	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw \| diff to current
2014-01-14	Junio C Hamano	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-11-07	Junio C Hamano	Merge branch 'vd/doc-unpack-objects' into maint	blob \| commitdiff \| raw \| diff to current
2013-11-04	Junio C Hamano	Merge branch 'vd/doc-unpack-objects'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/refs-c-squelch-gcc'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/date-c-double-semicolon'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'rj/highlight-test-hang'	blob \| commitdiff \| raw \| diff to current
2013-06-17	Junio C Hamano	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-05-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-05-13	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-03-28	Junio C Hamano	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'dl/am-hg-locale' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'dl/am-hg-locale'	blob \| commitdiff \| raw \| diff to current
2013-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom