merge: refuse to create too cool a merge by default
[git] / list-objects.c
2016-03-17  Junio C HamanoSync with Git 2.6.6
2016-03-17  Junio C HamanoMerge branch 'maint-2.5' into maint-2.6
2016-03-17  Junio C HamanoMerge branch 'maint-2.4' into maint-2.5
2016-03-17  Junio C HamanoMerge branch 'jk/path-name-safety-2.4' into maint-2.4
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.7' into maint
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.6' into jk/path...
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.5' into jk/path...
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.4' into jk/path...
2016-03-16  Jeff Kinglist-objects: pass full pathname to callbacks
2016-03-16  Jeff Kinglist-objects: drop name_path entirely
2016-03-16  Jeff Kinglist-objects: convert name_path to a strbuf
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
2016-01-04  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' into maint
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 'ls/p4-keep-empty-commits' into 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 'jk/prune-mtime' into maint
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 'cb/t3404-shellquote' into 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-12-08  Junio C HamanoMerge branch 'ad/sha1-update-chunked' into maint
2015-12-08  Junio C HamanoMerge branch 'jk/rebase-no-autostash' into maint
2015-12-04  Junio C HamanoMerge branch 'da/difftool' into maint
2015-12-04  Junio C HamanoMerge branch 'ad/sha1-update-chunked'
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-20  brian m. carlsonConvert struct object to object_id
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05  Junio C HamanoMerge branch 'js/misc-fixes' into maint
2015-11-05  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top' into maint
2015-11-05  Junio C HamanoMerge branch 'jk/delete-modechange-conflict' into maint
2015-11-05  Junio C HamanoMerge branch 'sa/send-email-smtp-batch-data-limit'...
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-ff' into maint
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-markup' into maint
2015-11-04  Junio C HamanoMerge branch 'jc/everyday-markup' into maint
2015-11-04  Junio C HamanoMerge branch 'jc/em-dash-in-doc' into maint
2015-11-04  Junio C HamanoMerge branch 'es/worktree-add' into maint
2015-11-03  Junio C HamanoMerge branch 'mk/blame-error-message' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/merge-file-exit-code' into maint
2015-11-03  Junio C HamanoMerge branch 'dt/name-hash-dir-entry-fix' into maint
2015-11-03  Junio C HamanoMerge branch 'nd/gc-auto-background-fix' into maint
2015-11-03  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
next