Merge branch 'jk/complete-branch-force-delete'
[git] / builtin / merge.c
2021-02-12  Junio C HamanoMerge branch 'jk/complete-branch-force-delete'
2021-02-12  Junio C HamanoMerge branch 'jv/upload-pack-filter-spec-quotefix'
2021-02-12  Junio C HamanoMerge branch 'tb/pack-revindex-on-disk'
2021-02-12  Junio C HamanoMerge branch 'ab/tests-various-fixup'
2021-02-11  Junio C HamanoSync with maint
2021-02-11  Junio C HamanoMerge branch 'en/merge-ort-perf'
2021-02-11  Junio C HamanoMerge branch 'en/ort-directory-rename'
2021-02-11  Junio C HamanoMerge branch 'tb/ci-run-cocci-with-18.04'
2021-02-10  Junio C HamanoMerge branch 'ab/detox-gettext-tests'
2021-02-10  Junio C HamanoMerge branch 'ab/grep-pcre-invalid-utf8'
2021-02-10  Junio C HamanoMerge branch 'ab/retire-pcre1'
2021-02-10  Junio C HamanoMerge branch 'jk/pretty-lazy-load-commit'
2021-02-10  Junio C HamanoMerge branch 'ds/more-index-cleanups'
2021-02-10  Junio C HamanoMerge branch 'rs/worktree-list-verbose'
2021-02-10  Junio C HamanoMerge branch 'js/rebase-i-commit-cleanup-fix'
2021-02-10  Junio C HamanoMerge branch 'jk/t0000-cleanups'
2021-02-10  Junio C HamanoMerge branch 'sg/t7800-difftool-robustify'
2021-02-10  Junio C HamanoMerge branch 'ab/lose-grep-debug'
2021-02-10  Junio C HamanoMerge branch 'jk/use-oid-pos'
2021-02-08  Junio C HamanoSync with 2.30.1
2021-02-08  Junio C HamanoMerge branch 'pb/blame-funcname-range-userdiff' into...
2021-02-08  Junio C HamanoMerge branch 'dl/p4-encode-after-kw-expansion' into...
2021-02-08  Junio C HamanoMerge branch 'ma/doc-pack-format-varint-for-sizes'...
2021-02-08  Junio C HamanoMerge branch 'fc/t6030-bisect-reset-removes-auxiliary...
2021-02-06  Junio C HamanoSync with maint
2021-02-06  Junio C HamanoMerge branch 'sg/test-stress-jobs'
2021-02-06  Junio C HamanoMerge branch 'jk/weather-balloon-require-variadic-macro'
2021-02-06  Junio C HamanoMerge branch 'pb/ci-matrix-wo-shortcut'
2021-02-06  Junio C HamanoMerge branch 'pb/blame-funcname-range-userdiff'
2021-02-06  Junio C HamanoMerge branch 'jk/p5303-sed-portability-fix'
2021-02-06  Junio C HamanoMerge branch 'jv/pack-objects-narrower-ref-iteration'
2021-02-06  Junio C HamanoMerge branch 'ph/use-delete-refs'
2021-02-06  Junio C HamanoMerge branch 'tb/ls-refs-optim'
2021-02-06  Junio C HamanoMerge branch 'zh/ls-files-deduplicate'
2021-02-06  Junio C HamanoMerge branch 'ds/cache-tree-basics'
2021-02-06  Junio C HamanoMerge branch 'en/ort-conflict-handling'
2021-02-06  Junio C HamanoMerge branch 'so/log-diff-merge'
2021-02-06  Junio C HamanoMerge branch 'js/skip-dashed-built-ins-from-config...
2021-02-06  Junio C HamanoMerge branch 'ab/fsck-doc-fix' into maint
2021-02-06  Junio C HamanoMerge branch 'jk/log-cherry-pick-duplicate-patches...
2021-02-06  Junio C HamanoMerge branch 'jk/forbid-lf-in-git-url' into maint
2021-02-06  Junio C HamanoMerge branch 'ad/t4129-setfacl-target-fix' into maint
2021-02-06  Junio C HamanoMerge branch 'vv/send-email-with-less-secure-apps-acces...
2021-02-06  Junio C HamanoMerge branch 'pb/mergetool-tool-help-fix' into maint
2021-02-06  Junio C HamanoMerge branch 'rs/rebase-commit-validation' into maint
2021-02-06  Junio C HamanoMerge branch 'pb/doc-modules-git-work-tree-typofix...
2021-02-06  Junio C HamanoMerge branch 'pk/subsub-fetch-fix-take-2' into maint
2021-02-03  Junio C HamanoMerge branch 'js/skip-dashed-built-ins-from-config...
2021-02-03  Junio C HamanoMerge branch 'ab/fsck-doc-fix'
2021-01-25  Junio C HamanoMerge branch 'jk/log-cherry-pick-duplicate-patches'
2021-01-25  Junio C HamanoMerge branch 'sj/untracked-files-in-submodule-directory...
2021-01-25  Junio C HamanoMerge branch 'jk/forbid-lf-in-git-url'
2021-01-25  Junio C HamanoMerge branch 'en/merge-ort-3'
2021-01-16  Junio C HamanoMerge branch 'dl/p4-encode-after-kw-expansion'
2021-01-16  Junio C HamanoMerge branch 'ad/t4129-setfacl-target-fix'
2021-01-16  Junio C HamanoMerge branch 'vv/send-email-with-less-secure-apps-access'
2021-01-16  Junio C HamanoMerge branch 'pb/mergetool-tool-help-fix'
2021-01-16  Junio C HamanoMerge branch 'ds/maintenance-part-4'
2021-01-15  Junio C HamanoMerge branch 'rs/rebase-commit-validation'
2021-01-15  Junio C HamanoMerge branch 'ma/doc-pack-format-varint-for-sizes'
2021-01-15  Junio C HamanoMerge branch 'pb/doc-modules-git-work-tree-typofix'
2021-01-15  Junio C HamanoMerge branch 'ew/decline-core-abbrev'
2021-01-14  Junio C HamanoMerge branch 'en/ort-conflict-handling' into en/merge...
2021-01-07  Junio C HamanoMerge branch 'en/merge-ort-3' into en/ort-directory...
2021-01-07  Junio C HamanoMerge branch 'es/perf-export-fix'
2021-01-07  Junio C HamanoMerge branch 'fc/t6030-bisect-reset-removes-auxiliary...
2021-01-07  Junio C HamanoMerge branch 'en/merge-ort-recursive'
2021-01-07  Junio C HamanoMerge branch 'en/merge-ort-2'
2021-01-07  Junio C HamanoMerge branch 'en/merge-ort-impl'
2021-01-07  Junio C HamanoMerge branch 'tb/pack-bitmap'
2021-01-07  Junio C HamanoMerge branch 'pk/subsub-fetch-fix-take-2'
2020-12-27  Junio C HamanoMerge branch 'pb/doc-git-linkit-fix'
2020-12-23  Junio C HamanoMerge branch 'nk/refspecs-negative-fix'
2020-12-23  Junio C HamanoMerge branch 'dl/checkout-p-merge-base'
2020-12-23  Junio C HamanoMerge branch 'jx/pack-redundant-on-single-pack'
2020-12-21  Sergey Organovdiff-merges: new function diff_merges_suppress()
2020-12-18  Junio C HamanoMerge branch 'jc/diff-I-status-fix'
2020-12-18  Junio C HamanoMerge branch 'es/perf-export-fix'
2020-12-18  Junio C HamanoMerge branch 'rb/nonstop-config-mak-uname-update'
2020-12-18  Junio C HamanoMerge branch 'ab/unreachable-break'
2020-12-18  Junio C HamanoMerge branch 'jc/strmap-remove-typefix'
2020-12-18  Junio C HamanoMerge branch 'jc/compat-util-setitimer-fix'
2020-12-18  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-12-17  Junio C HamanoMerge branch 'jh/index-v2-doc-on-fsmn'
2020-12-17  Junio C HamanoMerge branch 'jb/midx-doc-update'
2020-12-14  Junio C HamanoMerge branch 'js/cmake-extra-built-ins-fix'
2020-12-14  Junio C HamanoMerge branch 'da/vs-build-iconv-fix'
2020-12-14  Junio C HamanoMerge branch 'jk/multi-line-indent-style-fix'
2020-12-14  Junio C HamanoMerge branch 'jk/check-config-parsing-error-in-upload...
2020-12-14  Junio C HamanoMerge branch 'ae/doc-reproducible-html'
2020-12-14  Junio C HamanoMerge branch 'so/glossary-branch-is-not-necessarily...
2020-12-14  Junio C HamanoMerge branch 'dd/help-autocorrect-never'
2020-12-08  Junio C HamanoMerge branch 'fc/zsh-completion'
2020-12-08  Junio C HamanoMerge branch 'sn/config-doc-typofix'
2020-12-08  Junio C HamanoMerge branch 'rs/fetch-pack-invalid-lockfile'
2020-12-08  Junio C HamanoMerge branch 'js/trace2-session-id'
2020-12-08  Junio C HamanoMerge branch 'mt/do-not-use-scld-in-working-tree'
2020-12-08  Junio C HamanoMerge branch 'ds/maintenance-part-2'
2020-12-08  Junio C HamanoMerge branch 'ds/maintenance-part-1'
2020-12-08  Junio C HamanoMerge branch 'tb/idx-midx-race-fix'
next