merge: refuse to create too cool a merge by default
[git] / test-match-trees.c
2016-03-17  Junio C HamanoSync with Git 2.6.6
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.6' into jk/path...
2016-03-10  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix' into...
2016-03-10  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak' into maint
2016-03-10  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-comman...
2016-03-10  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test' into...
2016-03-10  Junio C HamanoMerge branch 'mm/push-simple-doc' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/more-comments-on-textconv' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/no-diff-emit-common' into maint
2016-03-10  Junio C HamanoMerge branch 'jc/am-i-v-fix' into maint
2016-03-10  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into...
2016-03-10  Junio C HamanoMerge branch 'mg/work-tree-tests' into maint
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-02-17  Junio C HamanoMerge branch 'nd/do-not-move-worktree-manually' into...
2016-02-17  Junio C HamanoMerge branch 'js/xmerge-marker-eol' into maint
2016-02-05  Junio C HamanoMerge branch 'lv/add-doc-working-tree' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint
2016-02-05  Junio C HamanoMerge branch 'js/dirname-basename' into maint
2016-02-05  Junio C HamanoMerge branch 'tb/complete-word-diff-regex' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/diff-with-path-params' into maint
2016-02-05  Junio C HamanoMerge branch 'dw/subtree-split-do-not-drop-merge' into...
2016-02-05  Junio C HamanoMerge branch 'ew/svn-1.9.0-auth' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/sanity' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/filter-branch-no-index' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...
2016-02-05  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning' into...
2016-02-05  Junio C HamanoMerge branch 'js/fopen-harder' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' into maint
2016-02-05  Junio C HamanoMerge branch 'dk/reflog-walk-with-non-commit' into...
2016-02-05  Junio C HamanoMerge branch 'dw/signoff-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/clang-pedantic' into maint
2016-02-05  Junio C HamanoMerge branch 'ew/send-email-mutt-alias-fix' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into maint
2016-01-04  Junio C HamanoSync with 2.6.5
2015-12-28  Junio C HamanoMerge branch 'jk/pending-keep-tag-name'
2015-12-28  Junio C HamanoMerge branch 'jk/symbolic-ref-maint'
2015-12-22  Junio C HamanoMerge branch 'js/emu-write-epipe-on-windows'
2015-12-21  Junio C HamanoMerge branch 'jk/ident-loosen-getpwuid'
2015-12-21  Junio C HamanoMerge branch 'jk/send-email-ssl-errors'
2015-12-21  Junio C HamanoMerge branch 'sg/completion-no-column'
2015-12-21  Junio C HamanoMerge branch 'mc/push-recurse-submodules-config'
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-12-16  Junio C HamanoMerge branch 'fr/rebase-i-continue-preserve-options'
2015-12-16  Junio C HamanoMerge branch 'maint'
2015-12-15  Junio C HamanoSync with maint
2015-12-15  Junio C HamanoMerge branch 'jk/send-email-complete-aliases'
2015-12-15  Junio C HamanoMerge branch 'ep/ident-with-getaddrinfo'
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits'
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime'
2015-12-11  Junio C HamanoMerge branch 'maint'
2015-12-11  Junio C HamanoMerge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11  Junio C HamanoMerge branch 'sb/doc-submodule-sync-recursive'
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote'
2015-12-11  Junio C HamanoMerge branch 'sg/lock-file-commit-error'
2015-12-11  Jiang XinMerge branch 'master' of git://github.com/git-l10n...
2015-12-10  Junio C HamanoSync with maint
2015-12-10  Junio C HamanoMerge branch 'nd/doc-check-ref-format-typo'
2015-12-10  Junio C HamanoMerge branch 'bc/object-id'
2015-11-20  brian m. carlsonRemove get_object_hash.
2015-11-20  brian m. carlsonAdd several uses of get_object_hash.
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-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix'
2015-09-17  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' into...
2015-09-17  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' into maint
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/submodule-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error'
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-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-07-15  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15  Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint
2015-07-01  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator'
2015-06-24  Junio C HamanoMerge branch 'fk/doc-format-patch-vn'
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-28  Junio C HamanoMerge branch 'mg/show-notes-doc'
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'
next