Merge branch 'mg/httpd-tests-update-for-apache-2.4'
[git] / builtin / merge-tree.c
2016-03-04  Junio C HamanoMerge branch 'mg/httpd-tests-update-for-apache-2.4'
2016-03-04  Junio C HamanoMerge branch 'js/mingw-tests'
2016-02-26  Junio C HamanoMerge branch 'mm/readme-markdown'
2016-02-26  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix'
2016-02-26  Junio C HamanoMerge branch 'ls/makefile-cflags-developer-tweak'
2016-02-26  Junio C HamanoMerge branch 'dt/initial-ref-xn-commit-doc'
2016-02-26  Junio C HamanoMerge branch 'js/config-set-in-non-repository'
2016-02-26  Junio C HamanoMerge branch 'jk/epipe-in-async'
2016-02-26  Junio C HamanoMerge branch 'mm/push-default-warning'
2016-02-26  Junio C HamanoMerge branch 'fa/merge-recursive-no-rename'
2016-02-26  Junio C HamanoMerge branch 'sb/submodule-fetch-nontip'
2016-02-26  Junio C HamanoMerge branch 'sb/submodule-module-list-fix'
2016-02-26  Junio C HamanoMerge branch 'tb/conversion'
2016-02-26  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test'
2016-02-26  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak'
2016-02-26  Junio C HamanoMerge branch 'mm/push-simple-doc'
2016-02-26  Junio C HamanoMerge branch 'jg/credential-cache-chdir-to-sockdir'
2016-02-26  Junio C HamanoMerge branch 'ps/config-error'
2016-02-26  Junio C HamanoMerge branch 'mg/work-tree-tests'
2016-02-26  Junio C HamanoMerge branch 'ls/config-origin'
2016-02-26  Junio C HamanoMerge branch 'jk/tighten-alloc'
2016-02-26  Junio C HamanoMerge branch 'jk/more-comments-on-textconv'
2016-02-26  Junio C HamanoMerge branch 'jk/no-diff-emit-common'
2016-02-26  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-command'
2016-02-26  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep'
2016-02-24  Junio C HamanoMerge branch 'jc/am-i-v-fix'
2016-02-24  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22  Jeff Kinguse xmallocz to avoid size arithmetic
2016-02-22  Junio C HamanoMerge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-02-17  Junio C HamanoMerge branch 'jk/rerere-xsnprintf'
2016-02-17  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
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-10  Junio C HamanoMerge branch 'wp/sha1-name-negative-match'
2016-02-10  Junio C HamanoMerge branch 'js/xmerge-marker-eol'
2016-02-10  Junio C HamanoMerge branch 'nd/do-not-move-worktree-manually'
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-02-03  Junio C HamanoMerge branch 'js/dirname-basename'
2016-02-03  Junio C HamanoMerge branch 'nd/diff-with-path-params'
2016-02-03  Junio C HamanoMerge branch 'lv/add-doc-working-tree'
2016-02-03  Junio C HamanoMerge branch 'dw/subtree-split-do-not-drop-merge'
2016-02-03  Junio C HamanoMerge branch 'tb/complete-word-diff-regex'
2016-02-03  Junio C HamanoMerge branch 'tb/ls-files-eol'
2016-02-01  Junio C HamanoMerge branch 'ew/svn-1.9.0-auth'
2016-01-29  Junio C HamanoMerge branch 'jk/sanity'
2016-01-29  Junio C HamanoMerge branch 'jk/filter-branch-no-index'
2016-01-26  Junio C HamanoMerge branch 'jk/ok-to-fail-gc-auto-in-rebase'
2016-01-22  Junio C HamanoMerge branch 'rm/subtree-unwrap-tags'
2016-01-20  Junio C HamanoMerge branch 'tg/grep-no-index-fallback'
2016-01-20  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning'
2016-01-20  Junio C HamanoMerge branch 'js/fopen-harder'
2016-01-20  Junio C HamanoMerge branch 'ss/clone-depth-single-doc'
2016-01-20  Junio C HamanoMerge branch 'nd/exclusion-regression-fix'
2016-01-20  Junio C HamanoMerge branch 'dk/reflog-walk-with-non-commit'
2016-01-20  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix'
2016-01-20  Junio C HamanoMerge branch 'ew/for-each-ref-doc'
2016-01-20  Junio C HamanoMerge branch 'dw/signoff-doc'
2016-01-20  Junio C HamanoMerge branch 'jk/clang-pedantic'
2016-01-20  Junio C HamanoMerge branch 'ew/send-email-mutt-alias-fix'
2016-01-20  Junio C HamanoMerge branch 'ss/user-manual'
2016-01-20  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-01-20  Junio C HamanoMerge branch 'nd/ita-cleanup'
2016-01-20  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup'
2016-01-20  Junio C HamanoMerge branch 'jk/pack-revindex'
2016-01-12  Junio C HamanoMerge branch 'vl/grep-configurable-threads'
2016-01-12  Junio C HamanoMerge branch 'ea/blame-progress'
2016-01-12  Junio C HamanoMerge branch 'ep/make-phoney'
2016-01-12  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree'
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-22  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into nd/clear...
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'
next