]> git.ipfire.org Git - thirdparty/git.git/history - merge.c
Merge branch 'en/merge-ort-api-null-impl'
[thirdparty/git.git] / merge.c
2020-11-18  Junio C HamanoMerge branch 'ds/maintenance-part-3'
2020-11-11  Junio C HamanoMerge branch 'jc/sequencer-stopped-sha-simplify'
2020-11-09  Junio C HamanoMerge branch 'jk/sideband-more-error-checking'
2020-11-09  Junio C HamanoMerge branch 'jk/committer-date-is-author-date-fix...
2020-11-02  Junio C HamanoMerge branch 'es/tutorial-mention-asciidoc-early'
2020-11-02  Junio C HamanoMerge branch 'bc/svn-hash-oid-fix'
2020-11-02  Junio C HamanoMerge branch 'en/sequencer-rollback-lock-cleanup'
2020-11-02  Junio C HamanoMerge branch 'mk/diff-ignore-regex'
2020-11-02  Junio C HamanoMerge branch 'jk/report-fn-typedef'
2020-11-02  Junio C HamanoMerge branch 'nk/dir-c-comment-update'
2020-11-02  Junio C HamanoMerge branch 'jk/no-common'
2020-11-02  Junio C HamanoMerge branch 'ds/maintenance-commit-graph-auto-fix'
2020-11-02  Junio C HamanoMerge branch 'ds/commit-graph-merging-fix'
2020-11-02  Junio C HamanoMerge branch 'es/test-cmp-typocatcher'
2020-11-02  Junio C HamanoMerge branch 'js/avoid-split-sideband-message'
2020-10-30  Junio C HamanoMerge branch 'en/t7518-unflake'
2020-10-29  Junio C HamanoMerge branch 'cc/doc-filter-branch-typofix' into maint
2020-10-29  Junio C HamanoMerge branch 'jk/committer-date-is-author-date-fix...
2020-10-27  Junio C HamanoMerge branch 'dl/checkout-p-merge-base'
2020-10-27  Junio C HamanoMerge branch 'ds/maintenance-part-2'
2020-10-26  Junio C HamanoMerge branch 'cc/doc-filter-branch-typofix'
2020-10-26  Junio C HamanoMerge branch 'jk/committer-date-is-author-date-fix'
2020-10-17  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-10-09  Junio C HamanoMerge branch 'jk/index-pack-hotfixes'
2020-10-05  Junio C HamanoMerge branch 'sn/fast-import-doc'
2020-10-05  Junio C HamanoMerge branch 'jk/diff-cc-oidfind-fix'
2020-10-05  Junio C HamanoMerge branch 'jk/refspecs-negative'
2020-10-05  Junio C HamanoMerge branch 'td/submodule-update-quiet'
2020-10-05  Junio C HamanoMerge branch 'so/combine-diff-simplify'
2020-10-05  Junio C HamanoMerge branch 'ds/in-merge-bases-many-optim-bug'
2020-10-04  Junio C HamanoMerge branch 'mt/delta-base-cache-races'
2020-10-04  Junio C HamanoMerge branch 'jk/shortlog-group-by-trailer'
2020-10-04  Junio C HamanoMerge branch 'jc/fmt-merge-msg-suppress-destination'
2020-10-04  Junio C HamanoMerge branch 'tb/upload-pack-filters'
2020-10-04  Junio C HamanoMerge branch 'jc/sequencer-stopped-sha-simplify'
2020-10-04  Junio C HamanoMerge branch 'eg/mailinfo-doc-scissors'
2020-10-04  Junio C HamanoMerge branch 'cc/bisect-start-fix'
2020-10-04  Junio C HamanoMerge branch 'jc/blame-ignore-fix'
2020-10-04  Junio C HamanoMerge branch 'jk/drop-unaligned-loads'
2020-10-03  Junio C HamanoMerge remote-tracking branch 'paulus/master' into pm...
2020-10-02  Junio C HamanoMerge branch 'ds/in-merge-bases-many-optim-bug' into...
2020-09-29  Junio C HamanoMerge branch 'ah/pull'
2020-09-29  Junio C HamanoMerge branch 'dl/zero-oid-in-hooks'
2020-09-29  Junio C HamanoMerge branch 'tb/bloom-improvements'
2020-09-25  Junio C HamanoMerge branch 'jk/diff-highlight-blank-match-fix'
2020-09-25  Junio C HamanoMerge branch 'ld/p4-unshelve-fix'
2020-09-25  Junio C HamanoMerge branch 'jx/proc-receive-hook'
2020-09-25  Junio C HamanoMerge branch 'ds/maintenance-part-1'
2020-09-22  Junio C HamanoMerge branch 'ar/fetch-ipversion-in-all'
2020-09-22  Junio C HamanoMerge branch 'cs/don-t-pretend-a-failed-remote-set...
2020-09-22  Junio C HamanoMerge branch 'jk/dont-count-existing-objects-twice'
2020-09-22  Junio C HamanoMerge branch 'cd/commit-graph-doc'
2020-09-22  Junio C HamanoMerge branch 'ls/mergetool-meld-auto-merge'
2020-09-22  Junio C HamanoMerge branch 'jt/threaded-index-pack'
2020-09-19  Junio C HamanoMerge branch 'mt/config-fail-nongit-early'
2020-09-19  Junio C HamanoMerge branch 'mf/submodule-summary-with-correct-repository'
2020-09-19  Junio C HamanoMerge branch 'jk/add-i-fixes'
2020-09-19  Junio C HamanoMerge branch 'pw/add-p-leakfix'
2020-09-19  Junio C HamanoMerge branch 'al/t3200-back-on-a-branch'
2020-09-19  Junio C HamanoMerge branch 'ea/blame-use-oideq'
2020-09-19  Junio C HamanoMerge branch 'rs/parallel-read-cache-fix'
2020-09-09  Junio C HamanoMerge branch 'jt/interpret-branch-name-fallback'
2020-09-09  Junio C HamanoMerge branch 'hv/ref-filter-misc'
2020-09-09  Junio C HamanoMerge branch 'ss/submodule-summary-in-c-fixes'
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 '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 '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-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 'jt/promisor-pack-fix'
2020-08-31  Junio C HamanoMerge branch 'dd/diff-customize-index-line-abbrev'
2020-08-31  Junio C HamanoMerge branch 'am/ci-wsfix'
2020-08-27  Junio C HamanoMerge branch 'hn/refs-fetch-head-is-special'
2020-08-27  Junio C HamanoMerge branch 'rz/complete-more-options'
2020-08-27  Junio C HamanoMerge branch 'jk/leakfix'
2020-08-27  Junio C HamanoMerge branch 'en/mem-pool'
2020-08-24  Junio C HamanoMerge branch 'en/dir-clear'
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'
next