git.ipfire.org Git - thirdparty/git.git/history - t/t6428-merge-conflicts-sparse.sh

]> git.ipfire.org Git - thirdparty/git.git/history - t/t6428-merge-conflicts-sparse.sh

projects / thirdparty / git.git / history

[thirdparty/git.git] / t / t6428-merge-conflicts-sparse.sh

2022-04-04	Junio C Hamano	Merge branch 'gc/branch-recurse-submodules-fix'	blob \| commitdiff \| raw
2022-04-04	Junio C Hamano	Merge branch 'ns/core-fsyncmethod'	blob \| commitdiff \| raw
2022-04-04	Junio C Hamano	Merge branch 'dp/worktree-repair-in-usage'	blob \| commitdiff \| raw
2022-04-04	Junio C Hamano	Merge branch 'tl/ls-tree-oid-only'	blob \| commitdiff \| raw
2022-03-31	Junio C Hamano	Merge branch 'jd/prompt-upstream-mark'	blob \| commitdiff \| raw
2022-03-31	Junio C Hamano	Merge branch 'pw/add-p-single-key'	blob \| commitdiff \| raw
2022-03-31	Junio C Hamano	Merge branch 'ab/make-optim-noop'	blob \| commitdiff \| raw
2022-03-31	Junio C Hamano	Merge branch 'ab/racy-hooks'	blob \| commitdiff \| raw
2022-03-25	Junio C Hamano	Merge branch 'gc/recursive-fetch-with-unused-submodules'	blob \| commitdiff \| raw
2022-03-25	Junio C Hamano	Merge branch 'ns/core-fsyncmethod'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'ab/plug-random-leaks'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'jc/cat-file-batch-default-format-optim'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'js/in-place-reverse-in-sequencer'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'ps/repack-with-server-info'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'ab/reflog-prep-fix'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'ep/t6423-modernize'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'jk/name-rev-w-genno'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'jd/userdiff-kotlin'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'bc/block-sha1-without-gcc-asm-extension'	blob \| commitdiff \| raw
2022-03-23	Junio C Hamano	Merge branch 'gc/submodule-update-part1'	blob \| commitdiff \| raw
2022-03-21	Junio C Hamano	Merge branch 'jy/gitweb-no-need-for-meta'	blob \| commitdiff \| raw
2022-03-21	Junio C Hamano	Merge branch 'pw/single-key-interactive'	blob \| commitdiff \| raw
2022-03-21	Junio C Hamano	Merge branch 'ds/partial-bundles'	blob \| commitdiff \| raw
2022-03-21	Junio C Hamano	Merge branch 'ep/test-malloc-check-with-glibc-2.34'	blob \| commitdiff \| raw
2022-03-21	Junio C Hamano	Merge branch 'sm/no-git-in-upstream-of-pipe-in-tests'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'ab/string-list-count-in-size-t'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'ab/racy-hooks'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'ab/keep-git-exit-codes-in-tests'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'tk/t7063-chmtime-dirs-too'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'ds/commit-graph-gen-v2-fixes'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'jc/stash-drop'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'tb/rename-remote-progress'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'vd/sparse-read-tree'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'ab/object-file-api-updates'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'mf/fix-type-in-config-h'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'ps/fetch-mirror-optim'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'tk/empty-untracked-cache'	blob \| commitdiff \| raw
2022-03-17	Junio C Hamano	Merge branch 'ab/grep-patterntype'	blob \| commitdiff \| raw
2022-03-16	Junio C Hamano	Merge branch 'gc/submodule-update-part1' into gc/submod...	blob \| commitdiff \| raw
2022-03-15	Junio C Hamano	Merge branch 'ns/core-fsyncmethod' into ps/fsync-refs	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'ab/plug-random-leaks'	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'nj/read-tree-doc-reffix'	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'ps/fetch-atomic-fixup'	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'fs/gpgsm-update'	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'gc/parse-tree-indirect-errors'	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'en/merge-ort-align-verbosity-with-recursive'	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'ab/make-optim-noop'	blob \| commitdiff \| raw
2022-03-13	Junio C Hamano	Merge branch 'ps/fetch-atomic'	blob \| commitdiff \| raw
2022-03-09	Junio C Hamano	Merge branch 'ab/help-fixes'	blob \| commitdiff \| raw
2022-03-09	Junio C Hamano	Merge branch 'ab/c99-variadic-macros'	blob \| commitdiff \| raw
2022-03-09	Junio C Hamano	Merge branch 'hn/reftable-no-empty-keys'	blob \| commitdiff \| raw
2022-03-09	Junio C Hamano	Merge branch 'jc/cat-file-batch-commands'	blob \| commitdiff \| raw
2022-03-09	Junio C Hamano	Merge branch 'pw/xdiff-alloc-fail'	blob \| commitdiff \| raw
2022-03-09	Junio C Hamano	Merge branch 'en/present-despite-skipped'	blob \| commitdiff \| raw
2022-02-25	Junio C Hamano	Merge branch 'rs/pcre-invalid-utf8-fix-fix'	blob \| commitdiff \| raw \| diff to current
2022-01-14	Elijah Newren	repo_read_index: clear SKIP_WORKTREE bit from files...	blob \| commitdiff \| raw
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 'tb/pack-revindex-on-disk-cleanup'	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 'jk/t7006-sigpipe-tests-fix'	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-11-04	Junio C Hamano	Merge branch 'vd/pthread-setspecific-g11-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-11-04	Junio C Hamano	Merge branch 'vd/pthread-setspecific-g11-fix'	blob \| commitdiff \| raw \| diff to current
2021-11-01	Junio C Hamano	Merge branch 'ab/test-lib'	blob \| commitdiff \| raw \| diff to current
2021-10-29	Junio C Hamano	Merge branch 'bs/doc-blame-color-lines'	blob \| commitdiff \| raw \| diff to current
2021-10-18	Junio C Hamano	Merge branch 'bs/doc-blame-color-lines'	blob \| commitdiff \| raw \| diff to current
2021-10-18	Junio C Hamano	Merge branch 'rs/mergesort'	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'tk/fast-export-anonymized-tag-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'mh/send-email-reset-in-reply-to' into...	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'dd/diff-files-unmerged-fix' into maint	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'jk/apply-binary-hunk-parsing-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'kz/revindex-comment-fix' into maint	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'ba/object-info' into maint	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'es/walken-tutorial-fix' into maint	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'ga/send-email-sendmail-cmd' into maint	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'ti/tcsh-completion-regression-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'cb/builtin-merge-format-string-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-10-06	Junio C Hamano	Merge branch 'os/status-docfix'	blob \| commitdiff \| raw \| diff to current
2021-10-06	Junio C Hamano	Merge branch 'ew/midx-doc-update'	blob \| commitdiff \| raw \| diff to current
2021-10-04	Junio C Hamano	Merge branch 'rs/close-pack-leakfix'	blob \| commitdiff \| raw \| diff to current
2021-09-23	Junio C Hamano	Merge branch 'kz/revindex-comment-fix'	blob \| commitdiff \| raw \| diff to current
2021-09-10	Junio C Hamano	Merge branch 'gh/gitweb-branch-sort'	blob \| commitdiff \| raw \| diff to current
2021-09-10	Junio C Hamano	Merge branch 'tk/fast-export-anonymized-tag-fix'	blob \| commitdiff \| raw \| diff to current
2021-09-10	Junio C Hamano	Merge branch 'ba/object-info'	blob \| commitdiff \| raw \| diff to current
2021-09-10	Junio C Hamano	Merge branch 'mh/send-email-reset-in-reply-to'	blob \| commitdiff \| raw \| diff to current
2021-09-10	Junio C Hamano	Merge branch 'es/walken-tutorial-fix'	blob \| commitdiff \| raw \| diff to current
2021-09-08	Junio C Hamano	Merge branch 'dd/diff-files-unmerged-fix'	blob \| commitdiff \| raw \| diff to current
2021-09-08	Junio C Hamano	Merge branch 'ga/send-email-sendmail-cmd'	blob \| commitdiff \| raw \| diff to current
2021-09-03	Junio C Hamano	Merge branch 'ti/tcsh-completion-regression-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-30	Junio C Hamano	Merge branch 'jk/apply-binary-hunk-parsing-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-30	Junio C Hamano	Merge branch 'cb/builtin-merge-format-string-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-11	Junio C Hamano	Merge branch 'jn/log-m-does-not-imply-p'	blob \| commitdiff \| raw \| diff to current
2021-08-06	Junio C Hamano	Merge branch 'ab/pickaxe-pcre2'	blob \| commitdiff \| raw \| diff to current
2021-08-02	Junio C Hamano	Merge branch 'tb/bitmap-type-filter-comment-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'tb/reverse-midx'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'ds/gender-neutral-doc-guidelines'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'dl/diff-merge-base'	blob \| commitdiff \| raw \| diff to current
2021-07-28	Junio C Hamano	Merge branch 'dl/packet-read-response-end-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'jk/typofix'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom