Merge branch 'en/test-selector'
[git] / builtin / merge.c
2020-09-09  Junio C HamanoMerge branch 'ss/submodule-summary-in-c-fixes'
2020-09-09  Junio C HamanoMerge branch 'so/separate-field-for-m-and-diff-merges'
2020-09-09  Junio C HamanoMerge branch 'es/worktree-repair'
2020-09-09  Junio C HamanoMerge branch 'jk/worktree-check-clean-leakfix'
2020-09-09  Junio C HamanoMerge branch 'tb/repack-clearing-midx'
2020-09-09  Junio C HamanoMerge branch 'ss/submodule-summary-in-c'
2020-09-03  Junio C HamanoMerge branch 'pb/doc-external-diff-env'
2020-09-03  Junio C HamanoMerge branch 'jk/xrealloc-avoid-use-after-free'
2020-09-03  Junio C HamanoMerge branch 'jc/post-checkout-doc'
2020-09-03  Junio C HamanoMerge branch 'pb/doc-sequence-editor-configuration'
2020-09-03  Junio C HamanoMerge branch 'hl/bisect-doc-clarify-bad-good-ordering'
2020-09-03  Junio C HamanoMerge branch 'so/pretty-abbrev-doc'
2020-09-03  Junio C HamanoMerge branch 'mr/diff-hide-stat-wo-textual-change'
2020-09-03  Junio C HamanoMerge branch 'jt/lazy-fetch'
2020-09-03  Junio C HamanoMerge branch 'jc/run-command-use-embedded-args'
2020-09-03  Junio C HamanoMerge branch 'jc/undash-in-tree-git-callers'
2020-09-03  Junio C HamanoMerge branch 'jk/slimmed-down'
2020-09-03  Junio C HamanoMerge branch 'pw/add-p-allowed-options-fix'
2020-09-03  Junio C HamanoMerge branch 'jt/fetch-pack-loosen-validation-with...
2020-09-03  Junio C HamanoMerge branch 'ss/t7401-modernize'
2020-09-03  Junio C HamanoMerge branch 'pw/rebase-i-more-options'
2020-09-02  Jonathan Tanwt-status: tolerate dangling marks
2020-08-31  Junio C HamanoMerge branch 'ps/ref-transaction-hook'
2020-08-31  Junio C HamanoMerge branch 'jk/rev-input-given-fix'
2020-08-31  Junio C HamanoMerge branch 'jc/ident-whose-ident'
2020-08-31  Junio C HamanoMerge branch 'rp/apply-cached-doc'
2020-08-31  Junio C HamanoMerge branch 'rs/checkout-no-overlay-pathspec-fix'
2020-08-31  Junio C HamanoMerge branch 'al/bisect-first-parent'
2020-08-31  Junio C HamanoMerge branch 'jk/refspecs-cleanup'
2020-08-31  Junio C HamanoMerge branch 'hn/refs-pseudorefs'
2020-08-31  Junio C HamanoMerge branch 'jk/index-pack-w-more-threads'
2020-08-31  Junio C HamanoMerge branch 'hv/ref-filter-trailers-atom-parsing-fix'
2020-08-31  Junio C HamanoMerge branch 'am/ci-wsfix'
2020-08-27  Junio C HamanoMerge branch 'jk/leakfix'
2020-08-24  Junio C HamanoMerge branch 'rs/patch-id-with-incomplete-line'
2020-08-24  Junio C HamanoMerge branch 'dl/subtree-docs'
2020-08-24  Junio C HamanoMerge branch 'mt/checkout-entry-dead-code-removal'
2020-08-24  Junio C HamanoMerge branch 'ma/doc-sha-256-is-experimental'
2020-08-24  Junio C HamanoMerge branch 'rs/more-buffered-io'
2020-08-24  Junio C HamanoMerge branch 'jk/unleak-fixes'
2020-08-24  Junio C HamanoMerge branch 'en/dir-nonbare-embedded'
2020-08-24  Junio C HamanoMerge branch 'es/init-no-separate-git-dir-in-bare'
2020-08-21  Han-Wen Nienhuyssequencer: treat CHERRY_PICK_HEAD as a pseudo ref
2020-08-19  Junio C HamanoMerge branch 'jh/mingw-unlink'
2020-08-19  Junio C HamanoMerge branch 'jc/object-names-are-not-sha-1'
2020-08-19  Junio C HamanoMerge branch 'pb/set-url-docfix'
2020-08-19  Junio C HamanoMerge branch 'pb/userdiff-fortran-update'
2020-08-19  Junio C HamanoMerge branch 'jb/commit-graph-doc-fix'
2020-08-19  Junio C HamanoMerge branch 'jk/blame-coalesce-fix'
2020-08-19  Junio C HamanoMerge branch 'ak/sequencer-fix-find-uniq-abbrev'
2020-08-19  Junio C HamanoMerge branch 'en/sequencer-merge-labels'
2020-08-19  Junio C HamanoMerge branch 'rs/preserve-merges-unused-code-removal'
2020-08-19  Junio C HamanoMerge branch 'rs/upload-pack-sigchain-fix'
2020-08-19  Junio C HamanoMerge branch 'rp/ita-diff-modefix'
2020-08-18  Junio C HamanoMerge branch 'so/log-diff-merges-opt'
2020-08-18  Junio C HamanoMerge branch 'jk/log-fp-implies-m'
2020-08-18  Junio C HamanoMerge branch 'ma/stop-progress-null-fix'
2020-08-18  Junio C HamanoMerge branch 'es/test-cmp-typocatcher'
2020-08-18  Junio C HamanoMerge branch 'rp/apply-cached-with-i-t-a'
2020-08-18  Junio C HamanoMerge branch 'al/bisect-first-parent'
2020-08-18  Junio C HamanoMerge branch 'jk/sideband-error-l10n'
2020-08-18  Junio C HamanoMerge branch 'jc/noop-with-static-inline'
2020-08-18  Junio C HamanoMerge branch 'pd/mergetool-nvimdiff'
2020-08-18  Junio C HamanoMerge branch 'hn/reftable-prep-part-2'
2020-08-18  Junio C HamanoMerge branch 'dd/send-email-config'
2020-08-18  Junio C HamanoMerge branch 'ps/ref-transaction-hook'
2020-08-13  Junio C HamanoMerge branch 'rp/blame-first-parent-doc'
2020-08-13  Junio C HamanoMerge branch 'ma/test-quote-cleanup'
2020-08-13  Junio C HamanoMerge branch 'jt/has_object'
2020-08-13  Junio C HamanoMerge branch 'bc/sha-256-cvs-svn-updates'
2020-08-12  Junio C HamanoMerge branch 'ss/cmake-build'
2020-08-12  Junio C HamanoMerge branch 'tb/upload-pack-filters'
2020-08-12  Junio C HamanoMerge branch 'es/worktree-doc-cleanups'
2020-08-12  Junio C HamanoMerge branch 'bc/sha-256-part-3'
2020-08-10  Junio C HamanoMerge branch 'pb/guide-docs'
2020-08-10  Junio C HamanoMerge branch 'so/rev-parser-errormessage-fix'
2020-08-10  Junio C HamanoMerge branch 'en/eol-attrs-gotchas'
2020-08-10  Junio C HamanoMerge branch 'rs/bisect-oid-to-hex-fix'
2020-08-10  Junio C HamanoMerge branch 'en/merge-recursive-comment-fixes'
2020-08-10  Junio C HamanoMerge branch 'ma/t1450-quotefix'
2020-08-04  Junio C HamanoMerge branch 'jt/pretend-object-never-come-from-elsewhere'
2020-08-03  Elijah Newrenmerge: make merge.renormalize work for all uses of...
2020-07-31  Junio C HamanoMerge branch 'jb/doc-packfile-name' into master
2020-07-31  Junio C HamanoMerge branch 'rs/grep-simpler-parse-object-or-die-call...
2020-07-31  Junio C HamanoMerge branch 'ar/help-guides-doc' into master
2020-07-30  Junio C HamanoMerge branch 'en/fill-directory-exponential' into master
2020-07-30  Junio C HamanoMerge branch 'ct/mv-unmerged-path-error' into master
2020-07-30  Junio C HamanoMerge branch 'bc/push-cas-cquoted-refname' into master
2020-07-30  Junio C HamanoMerge branch 'rs/add-index-entry-optim-fix' into master
2020-07-30  Junio C HamanoMerge branch 'jk/reject-newer-extensions-in-v0' into...
2020-07-30  Junio C HamanoMerge branch 'jk/tests-timestamp-fix' into master
2020-07-30  Junio C HamanoMerge branch 'ds/commit-graph-bloom-updates' into master
2020-07-30  Junio C HamanoMerge branch 'sg/commit-graph-cleanups' into master
2020-07-26  Jiang XinMerge branch 'master' of github.com:Softcatala/git-po
2020-07-20  Junio C HamanoMerge https://github.com/prati0100/git-gui into master
2020-07-18  Junio C HamanoMerge branch 'dl/branch-cleanup' into master
2020-07-18  Junio C HamanoMerge branch 'js/pu-to-seen' into master
2020-07-17  Junio C HamanoMerge branch 'jn/v0-with-extensions-fix' into master
2020-07-15  Junio C HamanoMerge branch 'tb/commit-graph-no-check-oids' into master
2020-07-15  Junio C HamanoMerge branch 'ct/diff-with-merge-base-clarification...
next