Merge branch 'pw/sequencer-in-process-commit'
[git] / t / t6037-merge-ours-theirs.sh
2018-02-13  Junio C HamanoMerge branch 'pw/sequencer-in-process-commit'
2018-02-13  Junio C HamanoMerge branch 'nd/shared-index-fix'
2018-02-13  Junio C HamanoMerge branch 'po/http-push-error-message'
2018-02-13  Junio C HamanoMerge branch 'po/clang-format-functype-weight'
2018-02-13  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix'
2018-02-13  Junio C HamanoMerge branch 'sg/cocci-move-array'
2018-02-13  Junio C HamanoMerge branch 'tg/split-index-fixes'
2018-02-13  Junio C HamanoMerge branch 'rs/strbuf-cocci-workaround'
2018-02-13  Junio C HamanoMerge branch 'mr/packed-ref-store-fix'
2018-02-13  Junio C HamanoMerge branch 'jt/http-redact-cookies'
2018-02-13  Junio C HamanoMerge branch 'ds/use-get-be64'
2018-02-13  Junio C HamanoMerge branch 'cc/sha1-file-name'
2018-02-13  Junio C HamanoMerge branch 'nd/trace-with-env'
2018-02-13  Junio C HamanoMerge branch 'pc/submodule-helper'
2018-02-13  Junio C HamanoMerge branch 'rb/hashmap-h-compilation-fix'
2018-02-13  Junio C HamanoMerge branch 'nd/diff-flush-before-warning'
2018-02-13  Junio C HamanoMerge branch 'tb/crlf-conv-flags'
2018-02-13  Junio C HamanoMerge branch 'rs/describe-unique-abbrev'
2018-02-13  Junio C HamanoMerge branch 'ks/submodule-doc-updates'
2018-02-13  Junio C HamanoMerge branch 'cl/t9001-cleanup'
2018-02-13  Junio C HamanoMerge branch 'gs/retire-mru'
2018-02-13  Junio C HamanoMerge branch 'ot/mru-on-list'
2018-02-13  Junio C HamanoMerge branch 'jh/partial-clone'
2018-02-13  Junio C HamanoMerge branch 'jh/fsck-promisors'
2018-02-13  Junio C HamanoMerge branch 'ab/simplify-perl-makefile'
2018-01-23  Junio C HamanoMerge branch 'nd/add-i-ignore-submodules'
2018-01-23  Junio C HamanoMerge branch 'mm/send-email-fallback-to-local-mail...
2018-01-23  Junio C HamanoMerge branch 'ab/doc-cat-file-e-still-shows-errors'
2018-01-23  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix'
2018-01-23  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-01-23  Junio C HamanoMerge branch 'tg/stash-with-pathspec-fix'
2018-01-23  Junio C HamanoMerge branch 'sb/submodule-update-reset-fix'
2018-01-23  Junio C HamanoMerge branch 'bw/oidmap-autoinit'
2018-01-23  Junio C HamanoMerge branch 'ab/commit-m-with-fixup'
2018-01-23  Junio C HamanoMerge branch 'cc/codespeed'
2018-01-23  Junio C HamanoMerge branch 'ab/perf-grep-threads'
2018-01-23  Junio C HamanoMerge branch 'sb/diff-blobfind-pickaxe'
2018-01-23  Junio C HamanoMerge branch 'jk/abort-clone-with-existing-dest'
2018-01-23  Junio C HamanoMerge branch 'jc/merge-symlink-ours-theirs'
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui
2018-01-03  Junio C Hamanomerge: teach -Xours/-Xtheirs to symbolic link merge
2017-12-05  Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22  Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-07-25  Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-04-17  Junio C HamanoMerge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-01-18  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2016-10-20  Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26  Junio C HamanoMerge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui
2016-08-31  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix'
2016-07-28  Junio C HamanoMerge branch 'js/t3404-grammo-fix' into maint
2016-07-13  Junio C HamanoMerge branch 'js/t3404-grammo-fix'
2016-07-11  Junio C HamanoMerge branch 'cb/t7810-test-label-fix' into maint
2016-07-06  Junio C HamanoMerge branch 'cb/t7810-test-label-fix'
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18  Junio C HamanoMerge branch 'rn/glossary-typofix' into HEAD
2016-05-17  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix'
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix'
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes'
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string'
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix'
2015-05-26  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' into...
2015-05-13  Junio C HamanoMerge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long'
2015-05-06  Junio C HamanoMerge branch 'ep/fix-test-lib-functions-report'
2015-04-21  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14  Junio C HamanoMerge branch 'sb/plug-streaming-leak'
2015-04-14  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix'
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'tc/missing-http-proxyauth'
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-17  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07  Junio C HamanoMerge branch 'sb/t5400-remove-unused'
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date'
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
next