Merge branch 'jk/async-pkt-line'
[git] / merge-recursive.c
2015-10-05  Junio C HamanoMerge branch 'jh/quiltimport-explicit-series-file'
2015-10-05  Junio C HamanoMerge branch 'jc/rerere'
2015-09-17  Junio C HamanoMerge branch 'po/doc-branch-desc'
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 branch 'sg/help-group'
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 HamanoSync with 2.3.9
2015-09-04  Junio C HamanoSync with 2.2.3
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-04  Junio C HamanoMerge branch 'as/docfix-reflog-expire-unreachable'...
2015-09-04  Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings...
2015-09-04  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into...
2015-09-04  Junio C HamanoMerge branch 'sg/help-group' into maint
2015-09-04  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' into...
2015-09-04  Junio C HamanoMerge branch 'cb/open-noatime-clear-errno' into maint
2015-09-04  Junio C HamanoMerge branch 'mh/get-remote-group-fix' into maint
2015-09-02  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix'
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-31  Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings'
2015-08-31  Junio C HamanoMerge branch 'sg/config-name-only'
2015-08-28  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix'
2015-08-26  Junio C HamanoMerge branch 'sg/help-group'
2015-08-26  Junio C HamanoMerge branch 'as/docfix-reflog-expire-unreachable'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-25  Junio C HamanoMerge branch 'jk/test-with-x' into maint
2015-08-25  Junio C HamanoMerge branch 'sb/check-return-from-read-ref' into maint
2015-08-25  Junio C HamanoMerge branch 'cb/open-noatime-clear-errno'
2015-08-25  Junio C HamanoMerge branch 'dt/notes-multiple'
2015-08-25  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
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 'jk/test-with-x'
2015-08-19  Junio C HamanoMerge branch 'sb/check-return-from-read-ref'
2015-08-19  Junio C HamanoMerge branch 'ta/docfix-index-format-tech' into maint
2015-08-19  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19  Junio C HamanoMerge branch 'kn/tag-doc-fix' into maint
2015-08-19  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools' into maint
2015-08-19  Junio C HamanoMerge branch 'nd/export-worktree' into maint
2015-08-19  Junio C HamanoMerge branch 'se/doc-checkout-ours-theirs' into maint
2015-08-19  Junio C HamanoMerge branch 'cb/uname-in-untracked' 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-17  Junio C HamanoMerge branch 'ta/docfix-index-format-tech'
2015-08-17  Junio C HamanoMerge branch 'mh/get-remote-group-fix'
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-12  Junio C HamanoMerge branch 'dt/unpack-trees-cache-tree-revalidate'
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add-cleanup'
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add'
2015-08-03  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools'
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 'cb/uname-in-untracked'
2015-08-03  Junio C HamanoMerge branch 'se/doc-checkout-ours-theirs'
2015-08-03  Junio C HamanoMerge branch 'kn/tag-doc-fix'
2015-08-03  Junio C HamanoMerge branch 'mh/fast-import-get-mark'
2015-08-03  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn'
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 'bc/gpg-verify-raw'
2015-08-03  Junio C HamanoMerge branch 'pt/am-foreign'
2015-08-03  Junio C HamanoMerge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-08-03  Junio C HamanoMerge branch 'sg/completion-commit-cleanup' into maint
2015-08-03  Junio C HamanoMerge branch 'pt/am-abort-fix' into maint
2015-08-03  Junio C HamanoMerge branch 'mh/reporting-broken-refs-from-for-each...
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 'et/http-proxyauth' into maint
2015-07-27  Junio C HamanoMerge branch 'jc/unexport-git-pager-in-use-in-pager...
2015-07-27  Junio C HamanoMerge branch 'jk/rev-list-no-bitmap-while-pruning'...
2015-07-27  Junio C HamanoMerge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-27  Junio C HamanoMerge branch 'jk/fix-refresh-utime' into maint
2015-07-27  Junio C HamanoMerge branch 'cb/rebase-am-exit-code' into maint
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-17  Junio C HamanoMerge branch 'es/worktree-add'
2015-07-15  Junio C HamanoMerge branch 'jc/diff-ws-error-highlight'
2015-07-15  Junio C HamanoMerge branch 'mm/describe-doc' into maint
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 'pt/t0302-needs-sanity' into maint
2015-07-15  Junio C HamanoMerge branch 'me/fetch-into-shallow-safety' into maint
2015-07-15  Junio C HamanoMerge branch 'mh/fsck-reflog-entries' into maint
2015-07-15  Junio C HamanoMerge branch 'af/tcsh-completion-noclobber' into maint
next