Merge branch 'jk/async-pkt-line'
[git] / merge-recursive.c
2015-07-15  Junio C HamanoMerge branch 'pa/auto-gc-mac-osx' into maint
2015-07-15  Junio C HamanoMerge branch 'jc/do-not-feed-tags-to-clear-commit-marks...
2015-07-13  Junio C HamanoMerge branch 'es/worktree-add'
2015-07-13  Junio C HamanoMerge branch 'nd/multiple-work-trees'
2015-07-13  Junio C HamanoMerge branch 'jc/unexport-git-pager-in-use-in-pager'
2015-07-13  Junio C HamanoMerge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-07-13  Junio C HamanoMerge branch 'et/http-proxyauth'
2015-07-13  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh'
2015-07-10  Junio C HamanoMerge branch 'cb/rebase-am-exit-code'
2015-07-10  Junio C HamanoMerge branch 'jk/fix-refresh-utime'
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 'cb/subtree-tests-update'
2015-07-10  Junio C HamanoMerge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-10  Junio C HamanoMerge branch 'jk/pretty-encoding-doc'
2015-07-10  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2015-07-09  Junio C HamanoMerge branch 'jk/maint-for-each-packed-object'
2015-07-09  Junio C HamanoMerge branch 'jc/fix-alloc-sortbuf-in-index-pack'
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-07-01  Junio C HamanoMerge branch 'mm/describe-doc'
2015-07-01  Junio C HamanoMerge branch 'da/mergetool-winmerge'
2015-06-26  Junio C HamanoMerge branch 'jk/stash-require-clean-index' into maint
2015-06-26  Junio C HamanoMerge branch 'cb/array-size' into maint
2015-06-25  Junio C HamanoMerge branch 'cn/cvsimport-perl-update'
2015-06-25  Junio C HamanoMerge branch 'cb/array-size'
2015-06-25  Junio C HamanoMerge branch 'sg/merge-summary-config' into maint
2015-06-25  Junio C HamanoMerge branch 'jk/make-fix-dependencies' into maint
2015-06-25  Junio C HamanoMerge branch 'sb/pack-protocol-mention-smart-http'...
2015-06-25  Junio C HamanoMerge branch 'jk/die-on-bogus-worktree-late' into maint
2015-06-25  Junio C HamanoMerge branch 'pt/pull-tags-error-diag' into maint
2015-06-25  Junio C HamanoMerge branch 'jk/color-diff-plain-is-context' into...
2015-06-25  Junio C HamanoMerge branch 'jk/diagnose-config-mmap-failure' into...
2015-06-25  Junio C HamanoMerge branch 'jk/squelch-missing-link-warning-for-unrea...
2015-06-25  Junio C HamanoMerge branch 'mm/rebase-i-post-rewrite-exec' into maint
2015-06-25  Junio C HamanoMerge branch 'nd/diff-i-t-a'
2015-06-24  Junio C HamanoMerge branch 'jk/stash-require-clean-index'
2015-06-24  Junio C HamanoMerge branch 'pa/auto-gc-mac-osx'
2015-06-24  Junio C HamanoMerge branch 'pt/t0302-needs-sanity'
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 'mh/reporting-broken-refs-from-for-each...
2015-06-24  Junio C HamanoMerge branch 'sg/completion-commit-cleanup'
2015-06-24  Junio C HamanoMerge branch 'pt/am-abort-fix'
2015-06-24  Junio C HamanoMerge branch 'nd/untracked-cache'
2015-06-24  Junio C HamanoMerge branch 'mh/fsck-reflog-entries'
2015-06-24  Junio C HamanoMerge branch 'js/sleep-without-select'
2015-06-24  Junio C HamanoMerge branch 'es/utf8-stupid-compiler-workaround'
2015-06-24  Junio C HamanoMerge branch 'rl/am-3way-config'
2015-06-24  Junio C HamanoMerge branch 'jc/ll-merge-expose-path'
2015-06-24  Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro'
2015-06-24  Junio C HamanoMerge branch 'es/configure-getdelim'
2015-06-24  Junio C HamanoMerge branch 'qn/blame-show-email'
2015-06-24  Junio C HamanoMerge branch 'jc/do-not-feed-tags-to-clear-commit-marks'
2015-06-24  Junio C HamanoMerge branch 'es/send-email-sendmail-alias'
2015-06-24  Junio C HamanoMerge branch 'jc/apply-reject-noop-hunk'
2015-06-22  Junio C HamanoMerge branch 'jk/maint-for-each-packed-object' into...
2015-06-16  Junio C HamanoMerge branch 'jk/clone-dissociate' into maint
2015-06-16  Junio C HamanoMerge branch 'sb/submodule-doc-intro' into maint
2015-06-16  Junio C HamanoMerge branch 'sb/glossary-submodule' into maint
2015-06-16  Junio C HamanoMerge branch 'ah/usage-strings' into maint
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-16  Junio C HamanoMerge branch 'rs/janitorial' into maint
2015-06-16  Junio C HamanoMerge branch 'sb/test-bitmap-free-at-end' 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 'jk/stash-options' into maint
2015-06-16  Junio C HamanoMerge branch 'mm/log-format-raw-doc' into maint
2015-06-16  Junio C HamanoMerge branch 'ep/do-not-feed-a-pointer-to-array-size...
2015-06-16  Junio C HamanoMerge branch 'nd/slim-index-pack-memory-usage'
2015-06-16  Junio C HamanoMerge branch 'sb/pack-protocol-mention-smart-http'
2015-06-16  Junio C HamanoMerge branch 'jk/make-fix-dependencies'
2015-06-16  Junio C HamanoMerge branch 'jk/die-on-bogus-worktree-late'
2015-06-16  Junio C HamanoMerge branch 'sg/merge-summary-config'
2015-06-16  Junio C HamanoMerge branch 'ah/send-email-sendmail-alias'
2015-06-11  Junio C HamanoMerge branch 'tb/complete-sequencing'
2015-06-11  Junio C HamanoMerge branch 'jk/squelch-missing-link-warning-for-unrea...
2015-06-11  Junio C HamanoMerge branch 'pt/pull-tests'
2015-06-11  Junio C HamanoMerge branch 'sb/glossary-submodule'
2015-06-11  Junio C HamanoMerge branch 'sb/submodule-doc-intro'
2015-06-11  Junio C HamanoMerge branch 'jk/diagnose-config-mmap-failure'
2015-06-11  Junio C HamanoMerge branch 'mt/p4-depotFile-at-version'
2015-06-11  Junio C HamanoMerge branch 'mh/verify-lock-error-report'
2015-06-11  Junio C HamanoMerge branch 'jk/color-diff-plain-is-context'
2015-06-11  Junio C HamanoMerge branch 'jk/clone-dissociate'
2015-06-11  Junio C HamanoMerge branch 'jc/diff-ws-error-highlight'
2015-06-05  Junio C HamanoSync with 2.4.3
2015-06-05  Junio C HamanoMerge branch 'ld/p4-editor-multi-words'
2015-06-05  Junio C HamanoMerge branch 'bc/object-id'
2015-06-05  Junio C HamanoMerge branch 'jk/at-push-sha1'
2015-06-05  Junio C HamanoMerge branch 'dl/branch-error-message' into maint
2015-06-05  Junio C HamanoMerge branch 'jk/skip-http-tests-under-no-curl' into...
2015-06-05  Junio C HamanoMerge branch 'ps/doc-packfile-vs-pack-file' into maint
2015-06-05  Junio C HamanoMerge branch 'jk/rerere-forget-check-enabled' into...
2015-06-05  Junio C HamanoMerge branch 'pt/pull-log-n' into maint
2015-06-05  Junio C HamanoMerge branch 'rs/plug-leak-in-pack-bitmaps' into maint
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
next