Merge branch 'js/clone-dissociate' into maint
[git] / builtin / merge-tree.c
2015-11-03  Junio C HamanoMerge branch 'js/clone-dissociate' into maint
2015-11-03  Junio C HamanoMerge branch 'ld/p4-import-labels' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/repository-extension' into maint
2015-10-20  Junio C HamanoMerge branch 'js/gc-with-stale-symref' into maint
2015-10-20  Junio C HamanoMerge branch 'jc/doc-gc-prune-now' into maint
2015-10-20  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-19  Junio C HamanoMerge branch 'maint' of git://github.com/git-l10n/git...
2015-10-16  Junio C HamanoMerge branch 'es/worktree-add-cleanup' into maint
2015-10-16  Junio C HamanoMerge branch 'tk/doc-interpret-trailers-grammo' into...
2015-10-16  Junio C HamanoMerge branch 'tk/typofix-connect-unknown-proto-error...
2015-10-16  Junio C HamanoMerge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16  Junio C HamanoMerge branch 'nd/ls-remote-does-not-have-u-option'...
2015-10-16  Junio C HamanoMerge branch 'jc/fsck-dropped-errors' into maint
2015-10-16  Junio C HamanoMerge branch 'sb/http-flaky-test-fix' into maint
2015-10-16  Junio C HamanoMerge branch 'sb/perf-without-installed-git' into maint
2015-10-16  Junio C HamanoMerge branch 'js/icase-wt-detection' into maint
2015-10-16  Junio C HamanoMerge branch 'pt/am-builtin' into maint
2015-10-16  Junio C HamanoMerge branch 'mm/detach-at-HEAD-reflog' into maint
2015-10-16  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint
2015-10-16  Junio C HamanoMerge branch 'dt/log-follow-config' into maint
2015-10-16  Junio C HamanoMerge branch 'ti/glibc-stdio-mutex-from-signal-handler...
2015-10-16  Junio C HamanoMerge branch 'jk/notes-dwim-doc' into maint
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16  Junio C HamanoMerge branch 'jw/make-arflags-customizable' into maint
2015-10-16  Junio C HamanoMerge branch 'jk/connect-clear-env' into maint
2015-10-16  Junio C HamanoMerge branch 'jk/blame-first-parent' into maint
2015-10-16  Junio C HamanoMerge branch 'mm/keyid-docs' into maint
2015-10-16  Junio C HamanoMerge branch 'pt/pull-builtin' into maint
2015-09-29  Junio C HamanoSync with v2.5.4
2015-09-28  Junio C HamanoSync with 2.4.10
2015-09-28  Junio C HamanoSync with 2.3.10
2015-09-28  Junio C HamanoMerge branch 'jk/xdiff-memory-limits' into maint-2.3
2015-09-28  Jeff Kingreact to errors in xdi_diff
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-04  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' into...
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-31  Junio C HamanoMerge branch 'sg/describe-contains'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-25  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19  Junio C HamanoMerge branch 'jc/finalize-temp-file'
2015-08-19  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19  Junio C HamanoMerge branch 'nd/export-worktree' into maint
2015-08-19  Junio C HamanoMerge branch 'as/sparse-checkout-removal' into maint
2015-08-19  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head...
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-03  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head'
2015-08-03  Junio C HamanoMerge branch 'as/sparse-checkout-removal'
2015-08-03  Junio C HamanoMerge branch 'jc/commit-slab'
2015-08-03  Junio C HamanoMerge branch 'nd/export-worktree'
2015-08-03  Junio C HamanoMerge branch 'sg/completion-commit-cleanup' into maint
2015-08-03  Junio C HamanoMerge branch 'sg/commit-cleanup-scissors' into maint
2015-07-27  Junio C HamanoMerge branch 'jk/pretty-encoding-doc' into maint
2015-07-27  Junio C HamanoMerge branch 'mm/branch-doc-updates' into maint
2015-07-27  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh' into maint
2015-07-27  Junio C HamanoMerge branch 'jk/rev-list-no-bitmap-while-pruning'...
2015-07-27  Junio C HamanoMerge branch 'jk/index-pack-reduce-recheck' into maint
2015-07-21  Junio C HamanoMerge branch 'tf/gitweb-typofix'
2015-07-17  Junio C HamanoMerge branch 'jk/still-interesting'
2015-07-15  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15  Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro' into...
2015-07-15  Junio C HamanoMerge branch 'es/utf8-stupid-compiler-workaround' into...
2015-07-15  Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint
2015-07-15  Junio C HamanoMerge branch 'me/fetch-into-shallow-safety' into maint
2015-07-15  Junio C HamanoMerge branch 'af/tcsh-completion-noclobber' into maint
2015-07-13  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh'
2015-07-10  Junio C HamanoMerge branch 'mm/branch-doc-updates'
2015-07-10  Junio C HamanoMerge branch 'jk/rev-list-no-bitmap-while-pruning'
2015-07-10  Junio C HamanoMerge branch 'jk/pretty-encoding-doc'
2015-07-01  Junio C HamanoMerge branch 'me/fetch-into-shallow-safety'
2015-07-01  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator'
2015-06-25  Junio C HamanoMerge branch 'cn/cvsimport-perl-update'
2015-06-25  Junio C HamanoMerge branch 'mm/rebase-i-post-rewrite-exec' into maint
2015-06-24  Junio C HamanoMerge branch 'fk/doc-format-patch-vn'
2015-06-24  Junio C HamanoMerge branch 'sg/commit-cleanup-scissors'
2015-06-24  Junio C HamanoMerge branch 'jk/index-pack-reduce-recheck'
2015-06-24  Junio C HamanoMerge branch 'af/tcsh-completion-noclobber'
2015-06-24  Junio C HamanoMerge branch 'sg/completion-commit-cleanup'
2015-06-24  Junio C HamanoMerge branch 'es/utf8-stupid-compiler-workaround'
2015-06-24  Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro'
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-16  Junio C HamanoMerge branch 'dt/clean-pathspec-filter-then-lstat'...
2015-06-16  Junio C HamanoMerge branch 'jh/filter-empty-contents' into maint
2015-06-16  Junio C HamanoMerge branch 'mm/log-format-raw-doc' into maint
2015-06-05  Junio C HamanoMerge branch 'jk/skip-http-tests-under-no-curl' into...
2015-06-05  Junio C HamanoMerge branch 'jk/rerere-forget-check-enabled' into...
2015-06-05  Junio C HamanoMerge branch 'ja/tutorial-asciidoctor-fix' into maint
2015-06-05  Junio C HamanoMerge branch 'jk/stripspace-asciidoctor-fix' into maint
2015-06-05  Junio C HamanoMerge branch 'ps/bundle-verify-arg' into maint
next