summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2022-02-05Merge branch 'jh/p4-fix-use-of-process-error-exception'Libravatar Junio C Hamano1-3/+3
2022-02-05Merge branch 'jc/find-header'Libravatar Junio C Hamano3-25/+29
2022-02-05Merge branch 'pb/pull-rebase-autostash-fix'Libravatar Junio C Hamano2-4/+16
2022-02-02fix typo in git-mktree.txtLibravatar Liginity Lee1-1/+1
2022-02-02builtin/diff.c: fix "git-diff" usage string typoLibravatar Shaoxuan Yuan1-3/+3
2022-02-02diff-merges: avoid history simplifications when diffing mergesLibravatar Elijah Newren2-1/+59
2022-02-02merge-ort: mark conflict/warning messages from inner merges as omittableLibravatar Elijah Newren1-1/+3
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersLibravatar Elijah Newren4-0/+206
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-02-02repo-settings: rename the traditional default fetch.negotiationAlgorithmLibravatar Elijah Newren5-17/+21
2022-02-02repo-settings: fix error handling for unknown valuesLibravatar Elijah Newren2-0/+9
2022-02-02repo-settings: fix checking for fetch.negotiationAlgorithm=defaultLibravatar Elijah Newren2-3/+16
2022-02-01perl Git.pm: don't ignore signalled failure in _cmd_close()Libravatar Ævar Arnfjörð Bjarmason5-6/+19
2022-02-01subtree: force merge commitLibravatar Thomas Koutcher1-2/+2
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-28diff-filter: be more careful when looking for negative bitsLibravatar Johannes Schindelin3-17/+21
2022-01-28diff.c: move the diff filter bits definitions up a bitLibravatar Johannes Schindelin1-37/+37
2022-01-28docs(diff): lose incorrect claim about `diff-files --diff-filter=A`Libravatar Johannes Schindelin1-5/+2
2022-01-27stash: stop warning about the obsolete `stash.useBuiltin` config settingLibravatar Johannes Schindelin2-25/+0
2022-01-27stash: remove documentation for `stash.useBuiltin`Libravatar Johannes Schindelin1-7/+0
2022-01-27add: remove support for `git-legacy-stash`Libravatar Johannes Schindelin1-14/+0
2022-01-27git-sh-setup: remove remnant bits referring to `git-legacy-stash`Libravatar Johannes Schindelin1-1/+0
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-27pack-bitmap.c: gracefully fallback after opening pack/MIDXLibravatar Taylor Blau3-0/+51
2022-01-27midx: read `RIDX` chunk when presentLibravatar Taylor Blau7-7/+54
2022-01-27t/lib-bitmap.sh: parameterize tests over reverse index sourceLibravatar Taylor Blau1-6/+14
2022-01-27t5326: move tests to t/lib-bitmap.shLibravatar Taylor Blau2-171/+179
2022-01-27t5326: extract `test_rev_exists`Libravatar Taylor Blau1-15/+22
2022-01-27t5326: drop unnecessary setupLibravatar Taylor Blau1-4/+0
2022-01-27pack-revindex.c: instrument loading on-disk reverse indexLibravatar Taylor Blau1-0/+3
2022-01-27midx.c: make changing the preferred pack safeLibravatar Taylor Blau4-10/+29
2022-01-27t5326: demonstrate bitmap corruption after permutationLibravatar Taylor Blau1-0/+31
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 00:56:29 +0000