git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / builtin / merge.c

2020-10-09	Junio C Hamano	Merge branch 'js/no-builtins-on-disk-option'	blob \| commitdiff \| raw
2020-10-09	Junio C Hamano	Merge branch 'jk/index-pack-hotfixes'	blob \| commitdiff \| raw
2020-10-09	Junio C Hamano	Merge branch 'hx/push-atomic-with-cert'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'sn/fast-import-doc'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'jk/diff-cc-oidfind-fix'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'jk/refspecs-negative'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'rs/archive-add-file'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'jt/keep-partial-clone-filter-upon-lazy...	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'td/submodule-update-quiet'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'js/cmake-vs'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'ma/worktree-cleanups'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'so/combine-diff-simplify'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'js/default-branch-name-part-2'	blob \| commitdiff \| raw
2020-10-05	Junio C Hamano	Merge branch 'ds/in-merge-bases-many-optim-bug'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'mt/delta-base-cache-races'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'jk/shortlog-group-by-trailer'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'jc/fmt-merge-msg-suppress-destination'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'tb/upload-pack-filters'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'jc/sequencer-stopped-sha-simplify'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'al/ref-filter-merged-and-no-merged'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'eg/mailinfo-doc-scissors'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'mr/bisect-in-c-2'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'cc/bisect-start-fix'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'jc/blame-ignore-fix'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'jk/drop-unaligned-loads'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'js/no-builtins-on-disk-option'	blob \| commitdiff \| raw
2020-10-04	Junio C Hamano	Merge branch 'ab/mediawiki-fixes'	blob \| commitdiff \| raw
2020-10-03	Junio C Hamano	Merge remote-tracking branch 'paulus/master' into pm...	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'ah/pull'	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'tg/range-diff-same-file-fix'	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'jc/t1506-rev-parse-leaves-range-endpoint...	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'dl/zero-oid-in-hooks'	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'jk/make-protocol-v2-the-default'	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'bc/clone-with-git-default-hash-fix'	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'tb/bloom-improvements'	blob \| commitdiff \| raw
2020-09-29	Junio C Hamano	Merge branch 'bc/faq-misc'	blob \| commitdiff \| raw
2020-09-25	Junio C Hamano	Merge branch 'jk/diff-highlight-blank-match-fix'	blob \| commitdiff \| raw
2020-09-25	Junio C Hamano	Merge branch 'hx/push-atomic-with-cert'	blob \| commitdiff \| raw
2020-09-25	Junio C Hamano	Merge branch 'rs/misc-cleanups'	blob \| commitdiff \| raw
2020-09-25	Junio C Hamano	Merge branch 'ld/p4-unshelve-fix'	blob \| commitdiff \| raw
2020-09-25	Junio C Hamano	Merge branch 'jx/proc-receive-hook'	blob \| commitdiff \| raw
2020-09-25	Junio C Hamano	Merge branch 'ds/maintenance-part-1'	blob \| commitdiff \| raw
2020-09-22	Junio C Hamano	Merge branch 'ar/fetch-ipversion-in-all'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'cs/don-t-pretend-a-failed-remote-set...	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'jk/dont-count-existing-objects-twice'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'cd/commit-graph-doc'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'ls/mergetool-meld-auto-merge'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'pw/add-p-edit-ita-path'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'hn/refs-trace-backend'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'jt/threaded-index-pack'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'es/format-patch-interdiff-cleanup'	blob \| commitdiff \| raw \| diff to current
2020-09-22	Junio C Hamano	Merge branch 'os/fetch-submodule-optim'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'mt/config-fail-nongit-early'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'jc/dist-tarball-tweak'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'mf/submodule-summary-with-correct-repository'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'jc/quote-path-cleanup'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'os/collect-changed-submodules-optim'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'es/wt-add-detach'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'jk/add-i-fixes'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'pw/add-p-leakfix'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'jc/add-i-use-builtin-experimental'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'al/t3200-back-on-a-branch'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'hn/refs-ref-log-only-bit'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'ea/blame-use-oideq'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'pb/clang-json-compilation-database'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'so/log-tree-diff-cleanup'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'rs/parallel-read-cache-fix'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'rs/refspec-leakfix'	blob \| commitdiff \| raw \| diff to current
2020-09-19	Junio C Hamano	Merge branch 'rs/misc-cleanups'	blob \| commitdiff \| raw \| diff to current
2020-09-17	Derrick Stolee	maintenance: replace run_auto_gc()	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'os/vcbuild'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'jt/interpret-branch-name-fallback'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'pb/imap-send-updates'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'hv/ref-filter-misc'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'ss/submodule-summary-in-c-fixes'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'so/separate-field-for-m-and-diff-merges'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'es/worktree-repair'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'jk/worktree-check-clean-leakfix'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'tb/repack-clearing-midx'	blob \| commitdiff \| raw \| diff to current
2020-09-09	Junio C Hamano	Merge branch 'ss/submodule-summary-in-c'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'pb/doc-external-diff-env'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'jk/xrealloc-avoid-use-after-free'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'jc/post-checkout-doc'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'pb/doc-sequence-editor-configuration'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'hl/bisect-doc-clarify-bad-good-ordering'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'so/pretty-abbrev-doc'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'mr/diff-hide-stat-wo-textual-change'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'jt/lazy-fetch'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'jc/run-command-use-embedded-args'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'jc/undash-in-tree-git-callers'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'jk/slimmed-down'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'pw/add-p-allowed-options-fix'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'jt/fetch-pack-loosen-validation-with...	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'ss/t7401-modernize'	blob \| commitdiff \| raw \| diff to current
2020-09-03	Junio C Hamano	Merge branch 'pw/rebase-i-more-options'	blob \| commitdiff \| raw \| diff to current
2020-09-02	Jonathan Tan	wt-status: tolerate dangling marks	blob \| commitdiff \| raw \| diff to current
2020-08-31	Junio C Hamano	Merge branch 'ps/ref-transaction-hook'	blob \| commitdiff \| raw \| diff to current
2020-08-31	Junio C Hamano	Merge branch 'jk/rev-input-given-fix'	blob \| commitdiff \| raw \| diff to current
2020-08-31	Junio C Hamano	Merge branch 'jc/ident-whose-ident'	blob \| commitdiff \| raw \| diff to current
2020-08-31	Junio C Hamano	Merge branch 'rp/apply-cached-doc'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom