Merge branch 'bc/editorconfig'
[git] / builtin / merge-tree.c
2018-10-26  Junio C HamanoMerge branch 'bc/editorconfig'
2018-10-26  Junio C HamanoMerge branch 'ma/t7005-bash-workaround'
2018-10-26  Junio C HamanoMerge branch 'rs/subtree-fixes'
2018-10-19  Junio C HamanoMerge branch 'jt/cache-tree-allow-missing-object-in...
2018-10-19  Junio C HamanoMerge branch 'tb/filter-alternate-refs'
2018-10-19  Junio C HamanoMerge branch 'jt/avoid-ls-refs'
2018-10-19  Junio C HamanoMerge branch 'ds/commit-graph-leakfix'
2018-10-19  Junio C HamanoMerge branch 'jt/non-blob-lazy-fetch'
2018-10-19  Junio C HamanoMerge branch 'pw/diff-color-moved-ws-fix'
2018-10-19  Junio C HamanoMerge branch 'rs/oidset-on-khash'
2018-10-19  Junio C HamanoMerge branch 'rs/grep-no-recursive'
2018-10-19  Junio C HamanoMerge branch 'nd/help-commands-verbose-by-default'
2018-10-19  Junio C HamanoMerge branch 'jc/how-to-document-api'
2018-10-19  Junio C HamanoMerge branch 'sm/show-superproject-while-conflicted'
2018-10-19  Junio C HamanoMerge branch 'jt/fetch-tips-in-partial-clone'
2018-10-19  Junio C HamanoMerge branch 'nd/status-refresh-progress'
2018-10-19  Junio C HamanoMerge branch 'bp/read-cache-parallel'
2018-10-19  Junio C HamanoMerge branch 'bp/rename-test-env-var'
2018-10-19  Junio C HamanoMerge branch 'ss/wt-status-committable'
2018-10-19  Junio C HamanoMerge branch 'nd/the-index'
2018-10-16  Junio C HamanoMerge branch 'mw/doc-typofixes'
2018-10-16  Junio C HamanoMerge branch 'rs/sequencer-oidset-insert-avoids-dups'
2018-10-16  Junio C HamanoMerge branch 'ma/mailing-list-address-in-git-help'
2018-10-16  Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix'
2018-10-16  Junio C HamanoMerge branch 'ma/t1400-undebug-test'
2018-10-16  Junio C HamanoMerge branch 'ma/commit-graph-docs'
2018-10-16  Junio C HamanoMerge branch 'dz/credential-doc-url-matching-rules'
2018-10-16  Junio C HamanoMerge branch 'en/status-multiple-renames-to-the-same...
2018-10-16  Junio C HamanoMerge branch 'ds/reachable-final-cleanup'
2018-10-16  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-10-16  Junio C HamanoMerge branch 'jn/gc-auto'
2018-10-16  Junio C HamanoMerge branch 'jn/gc-auto-prep'
2018-10-16  Junio C HamanoMerge branch 'fe/doc-updates'
2018-10-16  Junio C HamanoMerge branch 'jn/mailmap-update'
2018-10-16  Junio C HamanoMerge branch 'tg/t5551-with-curl-7.61.1'
2018-10-16  Junio C HamanoMerge branch 'jk/delta-islands-with-bitmap-reuse-delta...
2018-10-16  Junio C HamanoMerge branch 'tq/refs-internal-comment-fix'
2018-10-16  Junio C HamanoMerge branch 'ts/alias-of-alias'
2018-10-16  Junio C HamanoMerge branch 'ds/commit-graph-with-grafts'
2018-10-16  Junio C HamanoMerge branch 'ab/commit-graph-progress'
2018-10-10  Junio C HamanoMerge branch 'ab/fsck-skiplist'
2018-10-10  Junio C HamanoMerge branch 'ds/multi-pack-verify'
2018-10-10  Junio C HamanoMerge branch 'bc/hash-independent-tests'
2018-10-10  Junio C HamanoMerge branch 'nd/test-tool'
2018-10-10  Junio C HamanoMerge branch 'nd/config-split'
2018-09-27  Junio C HamanoSync with 2.19.1
2018-09-27  Junio C HamanoSync with 2.18.1
2018-09-27  Junio C HamanoSync with 2.17.2
2018-09-27  Junio C HamanoSync with Git 2.14.4
2018-09-24  Junio C HamanoMerge branch 'tg/range-diff-corner-case-fix'
2018-09-24  Junio C HamanoMerge branch 'sg/split-index-test'
2018-09-24  Junio C HamanoMerge branch 'en/update-ref-no-deref-stdin'
2018-09-24  Junio C HamanoMerge branch 'ms/remote-error-message-update'
2018-09-24  Junio C HamanoMerge branch 'jt/lazy-object-fetch-fix'
2018-09-24  Junio C HamanoMerge branch 'en/sequencer-empty-edit-result-aborts'
2018-09-24  Junio C HamanoMerge branch 'ds/reachable'
2018-09-24  Junio C HamanoMerge branch 'nd/attr-pathspec-fix'
2018-09-24  Junio C HamanoMerge branch 'bw/protocol-v2'
2018-09-24  Junio C HamanoMerge branch 'sb/string-list-remove-unused'
2018-09-24  Junio C HamanoMerge branch 'jk/dev-build-format-security'
2018-09-24  Junio C HamanoMerge branch 'sg/t3701-tighten-trace'
2018-09-24  Junio C HamanoMerge branch 'sb/diff-color-move-more'
2018-09-24  Junio C HamanoMerge branch 'en/rerere-multi-stage-1-fix'
2018-09-24  Junio C HamanoMerge branch 'js/mingw-o-append'
2018-09-24  Junio C HamanoMerge branch 'en/double-semicolon-fix'
2018-09-24  Junio C HamanoMerge branch 'jk/reopen-tempfile-truncate'
2018-09-24  Junio C HamanoMerge branch 'bp/mv-submodules-with-fsmonitor'
2018-09-24  Junio C HamanoMerge branch 'ds/format-patch-range-diff-test'
2018-09-24  Junio C HamanoMerge branch 'tb/void-check-attr'
2018-09-24  Junio C HamanoMerge branch 'js/rebase-i-autosquash-fix'
2018-09-21  Nguyễn Thái Ngọc Duymerge-blobs.c: remove implicit dependency on the_index
2018-09-20  Junio C HamanoMerge branch 'ab/fetch-tags-noclobber'
2018-09-20  Junio C HamanoMerge branch 'bp/checkout-new-branch-optim'
2018-09-17  Junio C HamanoMerge branch 'nd/bisect-show-list-fix'
2018-09-17  Junio C HamanoMerge branch 'ab/fetch-tags-noclobber'
2018-09-17  Junio C HamanoMerge branch 'es/worktree-forced-ops-fix'
2018-09-17  Junio C HamanoMerge branch 'sg/doc-trace-appends'
2018-09-17  Junio C HamanoMerge branch 'jk/diff-rendered-docs'
2018-09-17  Junio C HamanoMerge branch 'jk/patch-corrupted-delta-fix'
2018-09-17  Junio C HamanoMerge branch 'ds/commit-graph-tests'
2018-09-17  Junio C HamanoMerge branch 'jk/pack-objects-with-bitmap-fix'
2018-09-17  Junio C HamanoMerge branch 'rs/mailinfo-format-flowed'
2018-09-17  Junio C HamanoMerge branch 'jk/cocci'
2018-09-17  Junio C HamanoMerge branch 'tg/rerere-doc-updates'
2018-09-17  Junio C HamanoMerge branch 'es/format-patch-interdiff'
2018-09-17  Junio C HamanoMerge branch 'jk/trailer-fixes'
2018-09-17  Junio C HamanoMerge branch 'tg/rerere'
2018-09-17  Junio C HamanoMerge branch 'jk/branch-l-1-repurpose'
2018-09-17  Junio C HamanoMerge branch 'tg/conflict-marker-size'
2018-09-17  Junio C HamanoMerge branch 'ts/doc-build-manpage-xsl-quietly'
2018-09-17  Junio C HamanoMerge branch 'jk/rev-list-stdin-noop-is-ok'
2018-09-17  Junio C HamanoMerge branch 'bp/checkout-new-branch-optim'
2018-09-17  Junio C HamanoMerge branch 'sg/t1404-update-ref-test-timeout'
2018-09-17  Junio C HamanoMerge branch 'nd/clone-case-smashing-warning'
2018-09-17  Junio C HamanoMerge branch 'mk/http-backend-content-length'
2018-09-10  Junio C HamanoMerge branch 'mk/http-backend-content-length'
2018-09-04  Junio C HamanoMerge branch 'es/chain-lint-more'
2018-09-04  Junio C HamanoMerge branch 'es/freebsd-iconv-portability'
2018-09-04  Junio C HamanoMerge branch 'ds/commit-graph-lockfile-fix'
2018-09-04  Junio C HamanoMerge branch 'en/directory-renames-nothanks'
next