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

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

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

2022-02-25	Junio C Hamano	Merge branch 'ab/ambiguous-object-name'	blob \| commitdiff \| raw
2022-02-24	Junio C Hamano	Merge branch 'bc/clarify-eol-attr'	blob \| commitdiff \| raw
2022-02-24	Junio C Hamano	Merge branch 'ds/mailmap'	blob \| commitdiff \| raw
2022-02-24	Junio C Hamano	Merge branch 'ah/log-no-graph'	blob \| commitdiff \| raw
2022-02-24	Junio C Hamano	Merge branch 'hw/t1410-adjust-test-for-reftable'	blob \| commitdiff \| raw
2022-02-24	Junio C Hamano	Merge branch 'ps/fetch-optim-with-commit-graph'	blob \| commitdiff \| raw
2022-02-24	Junio C Hamano	Merge branch 'sy/t0001-use-path-is-helper'	blob \| commitdiff \| raw
2022-02-24	Junio C Hamano	Merge branch 'bs/forbid-i18n-of-protocol-token-in-fetch...	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'jc/glossary-worktree'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'jd/t0015-modernize'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'js/short-help-outside-repo-fix'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'tb/midx-no-bitmap-for-no-objects'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'ab/release-transport-ls-refs-options'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'ab/hash-object-leakfix'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'gc/branch-recurse-submodules'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'ab/t0051-skip-on-non-windows'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'ps/avoid-unnecessary-hook-invocation...	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'pw/use-in-process-checkout-in-rebase'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'cb/clear-quarantine-early-on-all-ref...	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'ab/complete-show-all-commands'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'sy/modernize-t-lib-read-tree-m-3way'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'po/doc-check-ignore-markup-fix'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'js/scalar-global-options'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'vd/sparse-clean-etc'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'jz/rev-list-exclude-first-parent-only'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'jz/patch-id-hunk-header-parsing-fix'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'hn/reftable-tests'	blob \| commitdiff \| raw
2022-02-18	Junio C Hamano	Merge branch 'tk/subtree-merge-not-ff-only'	blob \| commitdiff \| raw
2022-02-16	Junio C Hamano	Merge branch 'ab/do-not-hide-failures-in-git-dot-pm'	blob \| commitdiff \| raw
2022-02-16	Junio C Hamano	Merge branch 'js/no-more-legacy-stash'	blob \| commitdiff \| raw
2022-02-16	Junio C Hamano	Merge branch 'js/diff-filter-negation-fix'	blob \| commitdiff \| raw
2022-02-16	Junio C Hamano	Merge branch 'en/fetch-negotiation-default-fix'	blob \| commitdiff \| raw
2022-02-16	Junio C Hamano	Merge branch 'ab/auto-detect-zlib-compress2'	blob \| commitdiff \| raw
2022-02-16	Junio C Hamano	Merge branch 'tb/midx-bitmap-corruption-fix'	blob \| commitdiff \| raw
2022-02-16	Junio C Hamano	Merge branch 'en/remerge-diff'	blob \| commitdiff \| raw
2022-02-12	Junio C Hamano	Merge branch 'en/sparse-checkout-leakfix'	blob \| commitdiff \| raw \| diff to current
2022-02-12	Junio C Hamano	Merge branch 'rc/negotiate-only-typofix'	blob \| commitdiff \| raw \| diff to current
2022-02-09	Junio C Hamano	Merge branch 'en/merge-ort-restart-optim-fix'	blob \| commitdiff \| raw \| diff to current
2022-02-02	Elijah Newren	merge-ort: format messages slightly different for use...	blob \| commitdiff \| raw
2022-02-02	Elijah Newren	ll-merge: make callers responsible for showing warnings	blob \| commitdiff \| raw \| diff to current
2022-01-31	Junio C Hamano	Merge branch 'js/branch-track-inherit' into gc/branch...	blob \| commitdiff \| raw \| diff to current
2022-01-20	Junio C Hamano	Merge branch 'js/branch-track-inherit'	blob \| commitdiff \| raw \| diff to current
2022-01-19	Junio C Hamano	Merge branch 'js/branch-track-inherit'	blob \| commitdiff \| raw \| diff to current
2022-01-14	Junio C Hamano	Merge branch 'ab/refs-errno-cleanup'	blob \| commitdiff \| raw \| diff to current
2022-01-12	Junio C Hamano	Merge branch 'jt/pack-header-lshift-overflow'	blob \| commitdiff \| raw \| diff to current
2022-01-10	Junio C Hamano	Merge branch 'en/stash-df-fix'	blob \| commitdiff \| raw \| diff to current
2022-01-10	Junio C Hamano	Merge branch 'jc/doc-submitting-patches-choice-of-base'	blob \| commitdiff \| raw \| diff to current
2022-01-10	Junio C Hamano	Merge branch 'js/branch-track-inherit'	blob \| commitdiff \| raw \| diff to current
2022-01-10	Junio C Hamano	Merge branch 'ab/makefile-hook-list-dependency-fix'	blob \| commitdiff \| raw \| diff to current
2022-01-05	Junio C Hamano	Merge branch 'pw/diff-color-moved-fix'	blob \| commitdiff \| raw \| diff to current
2022-01-04	Junio C Hamano	Merge branch 'ns/tmp-objdir'	blob \| commitdiff \| raw \| diff to current
2021-12-21	Junio C Hamano	Merge branch 'ns/tmp-objdir' into en/remerge-diff	blob \| commitdiff \| raw \| diff to current
2021-12-21	Junio C Hamano	Merge branch 'ld/sparse-diff-blame'	blob \| commitdiff \| raw \| diff to current
2021-12-21	Junio C Hamano	Merge branch 'jc/c99-var-decl-in-for-loop'	blob \| commitdiff \| raw \| diff to current
2021-12-15	Junio C Hamano	Merge branch 'ab/parse-options-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-12-15	Junio C Hamano	Merge branch 'jc/reflog-iterator-callback-doc'	blob \| commitdiff \| raw \| diff to current
2021-12-15	Junio C Hamano	Merge branch 'ew/test-wo-fsync'	blob \| commitdiff \| raw \| diff to current
2021-12-15	Junio C Hamano	Merge branch 'tb/pack-revindex-on-disk-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-12-15	Junio C Hamano	Merge branch 'rj/receive-pack-avoid-sigpipe-during...	blob \| commitdiff \| raw \| diff to current
2021-12-15	Junio C Hamano	Merge branch 'es/pretty-describe-more'	blob \| commitdiff \| raw \| diff to current
2021-12-15	Junio C Hamano	Merge branch 'hn/reftable'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'cb/add-p-single-key-fix'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'mp/absorb-submodule-git-dir-upon-deinit'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'bc/require-c99'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'jt/midx-doc-fix'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'jk/t7006-sigpipe-tests-fix'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'jk/refs-g11-workaround'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'jk/fetch-pack-avoid-sigpipe-to-index...	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'hk/ci-checkwhitespace-commentfix'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'vd/sparse-reset'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'tl/midx-docfix'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'rs/mergesort'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'ah/advice-pull-has-no-preference-between...	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'jk/t5319-midx-corruption-test-deflake'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'js/trace2-avoid-recursive-errors'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'jt/pack-header-lshift-overflow'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'tw/var-default-branch'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'js/ci-no-directional-formatting'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'ja/doc-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'gc/remote-with-fewer-static-global-variables'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'vd/sparse-sparsity-fix-on-read'	blob \| commitdiff \| raw \| diff to current
2021-12-10	Junio C Hamano	Merge branch 'cw/protocol-v2-doc-fix'	blob \| commitdiff \| raw \| diff to current
2021-12-08	Junio C Hamano	Merge branch 'bc/require-c99' into jk/limit-developers...	blob \| commitdiff \| raw \| diff to current
2021-12-07	Junio C Hamano	Merge branch 'hn/reftable' into hn/reftable-coverity...	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'mc/clean-smudge-with-llp64'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'ab/sh-retire-helper-functions'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'tb/plug-pack-bitmap-leaks'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'tp/send-email-completion'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'jc/unsetenv-returns-an-int'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'jc/fix-ref-sorting-parse'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'so/stash-staged'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'jc/tutorial-format-patch-base'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'ab/refs-errno-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'ow/stash-count-in-status-porcelain-output'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'jk/loosen-urlmatch'	blob \| commitdiff \| raw \| diff to current
2021-11-29	Junio C Hamano	Merge branch 'vd/sparse-reset' into ld/sparse-diff...	blob \| commitdiff \| raw \| diff to current
2021-11-23	Junio C Hamano	Merge branch 'jc/save-restore-terminal-revert' into...	blob \| commitdiff \| raw \| diff to current
2021-11-23	Junio C Hamano	Merge branch 'ds/add-rm-with-sparse-index' into maint	blob \| commitdiff \| raw \| diff to current
2021-11-23	Junio C Hamano	Merge branch 'ab/update-submitting-patches' into maint	blob \| commitdiff \| raw \| diff to current
2021-11-23	Junio C Hamano	Merge branch 'ev/pull-already-up-to-date-is-noop' into...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom