summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2022-02-02diff: add ability to insert additional headers for pathsLibravatar Elijah Newren3-6/+123
2022-02-02merge-ort: format messages slightly different for use in headersLibravatar Elijah Newren3-2/+46
2022-02-02merge-ort: mark a few more conflict messages as omittableLibravatar Elijah Newren1-2/+2
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionLibravatar Elijah Newren3-6/+17
2022-02-02ll-merge: make callers responsible for showing warningsLibravatar Elijah Newren9-32/+63
2022-02-02log: clean unneeded objects during `log --remerge-diff`Libravatar Elijah Newren5-7/+28
2022-02-02show, log: provide a --remerge-diff capabilityLibravatar Elijah Newren6-2/+191
2022-01-31fetch --prune: exit with error if pruning failsLibravatar Thomas Gummerer2-4/+17
2022-01-28Sync with Git 2.35.1Libravatar Junio C Hamano1-0/+6
2022-01-28Name the next one 2.36 to prepare for 2.35.1Libravatar Junio C Hamano2-1/+35
2022-01-28Git 2.35.1Libravatar Junio C Hamano3-2/+8
2022-01-28Merge branch 'en/keep-cwd' into maintLibravatar Junio C Hamano3-2/+30
2022-01-28fetch: fix negotiate-only error messageLibravatar Robert Coup2-2/+2
2022-01-28sparse-checkout: fix a couple minor memory leaksLibravatar Elijah Newren1-0/+2
2022-01-27SubmittingPatches: explain why we care about log messagesLibravatar Junio C Hamano1-0/+29
2022-01-27CodingGuidelines: hint why we value clearly written log messagesLibravatar Junio C Hamano1-0/+7
2022-01-27SubmittingPatches: write problem statement in the log in the present tenseLibravatar Junio C Hamano1-0/+7
2022-01-26Merge branch 'en/keep-cwd'Libravatar Junio C Hamano3-2/+30
2022-01-26Start post 2.35 cycleLibravatar Junio C Hamano1-1/+1
2022-01-26Documentation/config/pgp.txt: add missing apostropheLibravatar Greg Hurrell1-1/+1
2022-01-26Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>Libravatar Greg Hurrell1-1/+1
2022-01-26refs API: remove "failure_errno" from refs_resolve_ref_unsafe()Libravatar Ævar Arnfjörð Bjarmason7-77/+33
2022-01-26sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failureLibravatar Ævar Arnfjörð Bjarmason1-6/+4
2022-01-26sequencer, stash: fix running from worktree subdirLibravatar Elijah Newren3-2/+30
2022-01-26clone: support unusual remote ref configurationsLibravatar Jonathan Tan2-6/+21
2022-01-24mem-pool: don't assume uintmax_t is aligned enough for all typesLibravatar Jessica Clarke1-3/+23
2022-01-24Git 2.35Libravatar Junio C Hamano2-1/+11
2022-01-24Merge branch 'ab/checkout-branch-info-leakfix'Libravatar Junio C Hamano2-3/+13
2022-01-24Merge tag 'l10n-2.35.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano11-39598/+36951
2022-01-23split-index: it really is incompatible with the sparse indexLibravatar Johannes Schindelin2-0/+6
2022-01-23t1091: disable split indexLibravatar Johannes Schindelin1-28/+26
2022-01-23sparse-index: sparse index is disallowed when split index is activeLibravatar Johannes Schindelin1-1/+1
2022-01-23l10n: Update Catalan translationLibravatar Jordi Mas1-16/+16
2022-01-22Merge branch 'l10n/zh_TW/220113' of github.com:l10n-tw/git-poLibravatar Jiang Xin1-3115/+3462
2022-01-21checkout: avoid BUG() when hitting a broken repositoryLibravatar Junio C Hamano2-3/+13
2022-01-21merge: fix memory leaks in cmd_merge()Libravatar Elijah Newren1-1/+5
2022-01-21merge-ort: fix memory leak in merge_ort_internal()Libravatar Elijah Newren1-5/+5
2022-01-22l10n: zh_TW: v2.35.0 round 2 (0 untranslated)Libravatar Yi-Jyun Pan1-84/+85
2022-01-21sparse-checkout: create leading directoryLibravatar Jonathan Tan2-0/+9
2022-01-21l10n: Update Catalan translationLibravatar Jordi Mas1-555/+444
2022-01-20Merge branch 'js/branch-track-inherit'Libravatar Junio C Hamano4-9/+9
2022-01-20fetch: help translators by reusing the same message templateLibravatar Junio C Hamano2-2/+3
2022-01-20reftable: add print functions to the record typesLibravatar Han-Wen Nienhuys3-15/+95
2022-01-20reftable: make reftable_record a tagged unionLibravatar Han-Wen Nienhuys12-337/+334
2022-01-20reftable: remove outdated file reftable.cLibravatar Han-Wen Nienhuys1-115/+0
2022-01-20reftable: implement record equality genericallyLibravatar Han-Wen Nienhuys3-22/+63
2022-01-20reftable: make reftable-record.h function signatures const correctLibravatar Han-Wen Nienhuys2-14/+14
2022-01-20reftable: handle null refnames in reftable_ref_record_equalLibravatar Han-Wen Nienhuys1-3/+5
2022-01-20reftable: drop stray printf in readwrite_testLibravatar Han-Wen Nienhuys1-1/+0
2022-01-20reftable: order unittests by complexityLibravatar Han-Wen Nienhuys1-4/+5