Merge branch 'rs/daemon-plug-child-leak'
[git] / builtin / merge-recursive.c
2015-11-03  Junio C HamanoMerge branch 'rs/daemon-plug-child-leak'
2015-11-03  Junio C HamanoMerge branch 'mk/blame-first-parent'
2015-11-03  Junio C HamanoMerge branch 'rs/wt-status-detached-branch-fix'
2015-11-03  Junio C HamanoMerge branch 'rs/show-branch-argv-array'
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03  Junio C HamanoMerge branch 'da/difftool'
2015-11-03  Junio C HamanoMerge branch 'jc/mailinfo-lib'
2015-11-03  Junio C HamanoMerge branch 'kn/for-each-branch'
2015-10-30  Junio C HamanoMerge branch 'jk/merge-file-exit-code'
2015-10-30  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn'
2015-10-30  Junio C HamanoMerge branch 'xf/user-manual-ff'
2015-10-30  Junio C HamanoMerge branch 'rs/pop-commit'
2015-10-30  Junio C HamanoMerge branch 'mk/blame-error-message'
2015-10-30  Junio C HamanoMerge branch 'js/misc-fixes'
2015-10-30  Junio C HamanoMerge branch 'js/imap-send-curl-compilation-fix'
2015-10-30  Junio C HamanoMerge branch 'jk/delete-modechange-conflict'
2015-10-30  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top'
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-29  Junio C HamanoMerge branch 'jc/am-mailinfo-direct'
2015-10-29  Junio C HamanoMerge branch 'jc/mailinfo-lib'
2015-10-29  Junio C HamanoMerge branch 'rp/link-curl-before-ssl'
2015-10-29  Junio C HamanoMerge branch 'dt/name-hash-dir-entry-fix'
2015-10-29  Junio C HamanoMerge branch 'tk/sigchain-unnecessary-post-tempfile'
2015-10-29  Junio C HamanoMerge branch 'jc/em-dash-in-doc'
2015-10-29  Junio C HamanoMerge branch 'jc/everyday-markup'
2015-10-29  Junio C HamanoMerge branch 'xf/user-manual-markup'
2015-10-26  Junio C HamanoMerge branch 'dk/p4-import-ctypes'
2015-10-26  Junio C HamanoMerge branch 'jk/repository-extension'
2015-10-26  Junio C HamanoMerge branch 'dt/t7063-fix-flaky-test'
2015-10-26  Junio C HamanoMerge branch 'kn/for-each-tag'
2015-10-26  Junio C HamanoMerge branch 'es/worktree-add'
2015-10-26  Junio C HamanoMerge branch 'tk/stripspace'
2015-10-26  Junio C HamanoMerge branch 'rt/placeholder-in-usage'
2015-10-26  Junio C HamanoMerge branch 'jc/usage-stdin'
2015-10-26  Junio C HamanoMerge branch 'mr/worktree-list'
2015-10-26  Junio C HamanoMerge branch 'jc/am-3-fallback-regression-fix'
2015-10-20  Junio C HamanoSync with maint
2015-10-20  Junio C HamanoMerge branch 'tb/t0027-crlf'
2015-10-20  Junio C HamanoMerge branch 'ls/p4-test-updates'
2015-10-20  Junio C HamanoMerge branch 'jk/war-on-sprintf'
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-25  Jeff Kingconvert trivial sprintf / strcpy calls to xsnprintf
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-05  Junio C HamanoMerge branch 'jc/gitignore-precedence' 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-19  Junio C HamanoMerge branch 'jc/gitignore-precedence'
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'
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-23  Junio C HamanoMerge branch 'jc/decorate-leaky-separator-color' into...
2015-03-20  Junio C HamanoMerge branch 'jc/decorate-leaky-separator-color'
2015-03-14  Junio C HamanoMerge branch 'jc/diff-test-updates' into maint
2015-03-14  Junio C HamanoMerge branch 'jc/apply-beyond-symlink' into maint
2015-03-10  Junio C HamanoMerge branch 'jc/decorate-leaky-separator-color' into...
2015-03-05  Junio C HamanoMerge branch 'es/blame-commit-info-fix' into maint
2015-03-05  Junio C HamanoMerge branch 'ab/merge-file-prefix' into maint
2015-03-05  Junio C HamanoMerge branch 'ps/submodule-sanitize-path-upon-add'...
2015-03-05  Junio C HamanoMerge branch 'jk/pack-bitmap' into maint
2015-03-05  Junio C HamanoMerge branch 'jk/decimal-width-for-uintmax' into maint
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-03-05  Junio C HamanoMerge branch 'jc/diff-test-updates'
2015-03-03  Junio C HamanoMerge branch 'jc/apply-beyond-symlink'
2015-02-25  Junio C HamanoMerge branch 'jc/send-email-sensible-encoding'
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'jc/max-io-size-and-ssize-max'
2015-02-25  Junio C HamanoMerge branch 'tc/missing-http-proxyauth'
2015-02-25  Junio C HamanoMerge branch 'jc/diff-format-doc' into maint
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25  Junio C HamanoMerge branch 'jk/status-read-branch-name-fix' into...
2015-02-22  Junio C HamanoMerge branch 'ps/submodule-sanitize-path-upon-add'
2015-02-22  Junio C HamanoMerge branch 'ab/merge-file-prefix'
2015-02-22  Junio C HamanoMerge branch 'es/blame-commit-info-fix'
2015-02-18  Junio C HamanoMerge branch 'jk/decimal-width-for-uintmax'
next