summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
8 hoursMerge branch 'js/apply-partial-clone-filters-recursively' into seenseenJunio C Hamano
8 hoursclone, submodule: pass partial clone filters to submodulesJosh Steadmon
8 hoursMerge branch 'rs/bisect-executable-not-found' into seenJunio C Hamano
8 hoursMerge branch 'ab/grep-patterntype' into seenJunio C Hamano
8 hoursMerge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs' into seenJunio C Hamano
8 hoursMerge branch 'en/present-despite-skipped' into seenJunio C Hamano
8 hoursMerge branch 'vd/sparse-clean-etc' into seenJunio C Hamano
8 hoursMerge branch 'jz/rev-list-exclude-first-parent-only' into seenJunio C Hamano
8 hoursMerge branch 'ld/sparse-index-bash-completion' into seenJunio C Hamano
8 hoursMerge branch 'tl/ls-tree-oid-only' into seenJunio C Hamano
8 hoursMerge branch 'jh/builtin-fsmonitor-part2' into seenJunio C Hamano
8 hoursMerge branch 'bs/forbid-i18n-of-protocol-token-in-fetch-pack' into seenJunio C Hamano
8 hoursMerge branch 'jh/builtin-fsmonitor-part2' (early part) into seenJunio C Hamano
8 hoursMerge branch 'pw/fix-some-issues-in-reset-head' into seenJunio C Hamano
8 hoursMerge branch 'es/superproject-aware-submodules' into seenJunio C Hamano
8 hoursMerge branch 'ab/only-single-progress-at-once' into seenJunio C Hamano
8 hoursMerge branch 'cb/save-term-across-editor-invocation' into seenJunio C Hamano
8 hoursMerge branch 'js/sparse-vs-split-index' into seenJunio C Hamano
8 hoursMerge branch 'jt/sparse-checkout-leading-dir-fix' into jchJunio C Hamano
8 hoursMerge branch 'ab/auto-detect-zlib-compress2' into jchJunio C Hamano
8 hoursMerge branch 'en/plug-leaks-in-merge' into jchJunio C Hamano
8 hoursMerge branch 'ab/checkout-branch-info-leakfix' into jchJunio C Hamano
8 hoursMerge branch 'rs/parse-options-lithelp-help' into jchJunio C Hamano
8 hoursMerge branch 'tb/midx-bitmap-corruption-fix' into jchJunio C Hamano
8 hoursMerge branch 'bc/csprng-mktemps' into jchJunio C Hamano
8 hoursMerge branch 'ab/ambiguous-object-name' into jchJunio C Hamano
8 hoursMerge branch 'en/remerge-diff' into jchJunio C Hamano
9 hourscheckout: avoid BUG() when hitting a broken repositoryJunio C Hamano
10 hoursmerge: fix memory leaks in cmd_merge()Elijah Newren
10 hoursmerge-ort: fix memory leak in merge_ort_internal()Elijah Newren
10 hourssplit-index: it really is incompatible with the sparse indexJohannes Schindelin
10 hourst1091: disable split indexJohannes Schindelin
10 hourssparse-index: sparse index is disallowed when split index is activeJohannes Schindelin
10 hourscache.h: auto-detect if zlib has uncompress2()Ævar Arnfjörð Bjarmason
11 hoursdiff-merges: avoid history simplifications when diffing mergesElijah Newren
11 hoursmerge-ort: mark conflict/warning messages from inner merges as omittableElijah Newren
11 hoursshow, log: include conflict/warning messages in --remerge-diff headersElijah Newren
11 hoursdiff: add ability to insert additional headers for pathsElijah Newren
11 hoursmerge-ort: format messages slightly different for use in headersElijah Newren
11 hoursmerge-ort: mark a few more conflict messages as omittableElijah Newren
11 hoursmerge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren
11 hoursll-merge: make callers responsible for showing warningsElijah Newren
11 hourslog: clean unneeded objects during `log --remerge-diff`Elijah Newren
11 hoursshow, log: provide a --remerge-diff capabilityElijah Newren
13 hourssparse-checkout: create leading directoryJonathan Tan
34 hoursMerge branch 'js/use-builtin-add-i' into jchJunio C Hamano
34 hoursMerge branch 'hn/reftable-coverity-fixes' into jchJunio C Hamano
34 hoursMerge branch 'gc/branch-recurse-submodules' into jchJunio C Hamano
34 hoursMerge branch 'bc/clarify-eol-attr' into jchJunio C Hamano
34 hours### match nextJunio C Hamano