pack-objects: handle island check for "external" delta base
[git] / builtin / merge.c
2018-09-17  Junio C HamanoMerge branch 'cc/delta-islands'
2018-09-17  Junio C HamanoMerge branch 'jk/trailer-fixes'
2018-09-17  Junio C HamanoMerge branch 'sb/range-diff-colors'
2018-09-17  Junio C HamanoMerge branch 'jk/pack-delta-reuse-with-bitmap'
2018-09-17  Junio C HamanoMerge branch 'nd/unpack-trees-with-cache-tree'
2018-09-17  Junio C HamanoMerge branch 'ds/reachable'
2018-09-17  Junio C HamanoMerge branch 'sb/submodule-update-in-c'
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'
2018-09-04  Junio C HamanoMerge branch 'pw/rebase-i-author-script-fix'
2018-08-27  Junio C HamanoMerge branch 'ds/commit-graph-fsck'
2018-08-27  Junio C HamanoMerge branch 'js/range-diff'
2018-08-27  Junio C HamanoMerge branch 'sg/test-rebase-editor-fix'
2018-08-27  Junio C HamanoMerge branch 'ab/test-must-be-empty-for-master'
2018-08-27  Junio C HamanoMerge branch 'sg/t3420-autostash-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t3903-missing-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t7501-thinkofix'
2018-08-27  Junio C HamanoMerge branch 'sg/t0020-conversion-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t4051-fix'
2018-08-27  Junio C HamanoMerge branch 'js/larger-timestamps'
2018-08-27  Junio C HamanoMerge branch 'jk/use-compat-util-in-test-tool'
2018-08-27  Junio C HamanoMerge branch 'sg/test-must-be-empty'
2018-08-27  Junio C HamanoMerge branch 'rs/opt-updates'
2018-08-27  Junio C HamanoMerge branch 'ab/unconditional-free-and-null'
2018-08-27  Junio C HamanoMerge branch 'nd/config-core-checkstat-doc'
2018-08-22  Junio C HamanoMerge branch 'nd/pack-deltify-regression-fix'
2018-08-21  Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po
2018-08-20  Junio C HamanoSync 'ds/multi-pack-index' to v2.19.0-rc0
2018-08-20  Junio C HamanoMerge branch 'ab/checkout-default-remote'
2018-08-20  Junio C HamanoMerge branch 'hn/highlight-sideband-keywords'
2018-08-20  Junio C HamanoMerge branch 'nd/cherry-pick-quit-fix'
2018-08-20  Junio C HamanoMerge branch 'pw/rebase-i-merge-segv-fix'
2018-08-20  Junio C HamanoMerge branch 'pw/rebase-i-squash-number-fix'
2018-08-20  Junio C HamanoMerge branch 'sb/config-write-fix'
2018-08-20  Junio C HamanoMerge branch 'ab/submodule-relative-url-tests'
2018-08-20  Junio C HamanoMerge branch 'en/incl-forward-decl'
2018-08-20  Junio C HamanoMerge branch 'jt/repack-promisor-packs'
2018-08-20  Junio C HamanoMerge branch 'wc/make-funnynames-shared-lazy-prereq'
2018-08-20  Junio C HamanoMerge branch 'jh/partial-clone-doc'
2018-08-20  Junio C HamanoMerge branch 'js/chain-lint-attrfix'
2018-08-20  Junio C HamanoMerge branch 'sb/pull-rebase-submodule'
2018-08-20  Junio C HamanoMerge branch 'js/range-diff'
2018-08-20  Junio C HamanoMerge branch 'nd/no-the-index'
2018-08-20  Junio C HamanoMerge branch 'es/chain-lint-more'
2018-08-20  Junio C HamanoMerge branch 'sg/t5310-empty-input-fix'
2018-08-20  Junio C HamanoMerge branch 'js/mingw-o-append'
2018-08-20  Junio C HamanoMerge branch 'jk/for-each-object-iteration'
2018-08-20  Junio C HamanoMerge branch 'ab/fetch-tags-noclobber'
2018-08-20  Junio C HamanoMerge branch 'ng/mergetool-lose-final-prompt'
2018-08-20  Junio C HamanoMerge branch 'jt/commit-graph-per-object-store'
2018-08-20  Junio C HamanoMerge branch 'ds/commit-graph-fsck'
2018-08-20  Junio C HamanoMerge branch 'jt/fetch-negotiator-skipping'
2018-08-20  Junio C HamanoMerge branch 'jc/gpg-status'
2018-08-20  Junio C HamanoMerge branch 'jc/update-index-doc'
2018-08-20  Junio C HamanoMerge branch 'en/update-index-doc'
2018-08-20  Junio C HamanoMerge branch 'js/typofixes'
2018-08-20  Junio C HamanoMerge branch 'sk/instaweb-rh-update'
2018-08-20  Junio C HamanoMerge branch 'en/t7406-fixes'
2018-08-20  Junio C HamanoMerge branch 'js/rebase-merges-exec-fix'
2018-08-20  Junio C HamanoMerge branch 'ab/test-must-be-empty-for-master'
2018-08-20  Junio C HamanoMerge branch 'ab/newhash-is-sha256'
2018-08-17  Junio C HamanoMerge branch 'nd/complete-config-vars'
2018-08-17  Junio C HamanoMerge branch 'ar/t4150-am-scissors-test-fix'
2018-08-17  Junio C HamanoMerge branch 'js/pull-rebase-type-shorthand'
2018-08-17  Junio C HamanoMerge branch 'jk/diff-rendered-docs'
2018-08-17  Junio C HamanoMerge branch 'hn/config-in-code-comment'
2018-08-17  Junio C HamanoMerge branch 'nd/config-blame-sort'
2018-08-17  Junio C HamanoMerge branch 'en/t3031-title-fix'
2018-08-17  Junio C HamanoMerge branch 'sb/indent-heuristic-optim'
2018-08-17  Junio C HamanoMerge branch 'en/abort-df-conflict-fixes'
2018-08-17  Junio C HamanoMerge branch 'mk/http-backend-content-length'
2018-08-17  Junio C HamanoMerge branch 'ot/ref-filter-object-info'
2018-08-17  Junio C HamanoMerge branch 'nd/no-extern'
2018-08-17  Junio C HamanoMerge branch 'es/want-color-fd-defensive'
2018-08-17  Junio C HamanoMerge branch 'ab/sha1dc'
2018-08-17  Junio C HamanoMerge branch 'rs/parse-opt-lithelp'
2018-08-17  Junio C HamanoMerge branch 'ab/fetch-nego'
2018-08-17  Junio C HamanoMerge branch 'jt/refspec-dwim-precedence-fix'
2018-08-17  Junio C HamanoMerge branch 'jk/merge-subtree-heuristics'
2018-08-17  Junio C HamanoMerge branch 'ab/test-must-be-empty'
2018-08-17  Junio C HamanoMerge branch 'es/rebase-i-author-script-fix'
2018-08-17  Junio C HamanoMerge branch 'ab/fsck-transfer-updates'
2018-08-15  Junio C HamanoMerge branch 'jt/connectivity-check-after-unshallow'
2018-08-15  Junio C HamanoMerge branch 'sg/travis-retrieve-trash-upon-failure'
2018-08-15  Junio C HamanoMerge branch 'rs/remote-mv-leakfix'
2018-08-15  Junio C HamanoMerge branch 'es/mw-to-git-chain-fix'
2018-08-15  Junio C HamanoMerge branch 'ms/http-proto-doc'
2018-08-15  Junio C HamanoMerge branch 'nd/pack-objects-threading-doc'
next