summaryrefslogtreecommitdiffstats
path: root/xdiff (unfollow)
Commit message (Expand)AuthorFilesLines
2022-08-08oneway_diff: handle removed sparse directoriesVictoria Dye1-0/+5
2022-08-08checkout: fix nested sparse directory diff in sparse indexVictoria Dye2-0/+9
2022-07-27Downmerge a handful of fixes for 2.37.x maintenance trackJunio C Hamano2-1/+48
2022-07-14shortlog: use a stable sortJohannes Schindelin1-1/+1
2022-07-14mergetool(vimdiff): allow paths to contain spaces againJohannes Schindelin1-4/+35
2022-07-14tests: fix incorrect --write-junit-xml codeJohannes Schindelin1-5/+5
2022-07-12diff-files: move misplaced cleanup labelJeff King1-1/+1
2022-07-08vimdiff: make layout engine more robust against user vim settingsFernando Ramos1-18/+18
2022-07-06ls-files: update test styleLi Linchao5-71/+132
2022-07-06merge-ort: fix issue with dual rename and add/add conflictElijah Newren2-3/+9
2022-07-06merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren1-5/+15
2022-07-06merge-ort: make a separate function for freeing struct collisionsElijah Newren1-16/+22
2022-07-06merge-ort: small cleanups of check_for_directory_renameElijah Newren1-6/+6
2022-07-06t6423: add tests of dual directory rename plus add/add conflictElijah Newren1-0/+105
2022-07-04Git 2.37.1v2.37.1Junio C Hamano3-2/+19
2022-07-01t6429: fix use of non-existent functionElijah Newren1-1/+1
2022-06-30config tests: fix harmless but broken "rm -r" cleanupÆvar Arnfjörð Bjarmason1-2/+3
2022-06-30test-lib.sh: fix prepend_var() quoting issueÆvar Arnfjörð Bjarmason1-2/+2
2022-06-30tests: add missing double quotes to included library pathsÆvar Arnfjörð Bjarmason3-3/+3
2022-06-30git-rebase.txt: use back-ticks consistentlyDerrick Stolee1-120/+122
2022-06-29pack-objects.h: remove outdated pahole resultsTaylor Blau1-10/+0
2022-06-29add --interactive: allow `update` to stage deleted filesJohannes Schindelin2-2/+19
2022-06-28vscode: improve tab size and wrappingDerrick Stolee1-2/+6
2022-06-27Git 2.37v2.37.0Junio C Hamano1-1/+1
2022-06-27revert: config documentation fixesRené Scharfe2-1/+3
2022-06-26l10n: sv.po: Update Swedish translation (5367t0f0u)Peter Krefting1-15781/+7654
2022-06-26l10n: ru.po: update Russian translationDimitriy Ryazantcev1-12978/+10334
2022-06-25l10n: zh_TW: v2.37.0 round 1Yi-Jyun Pan1-13955/+12996
2022-06-25l10n: vi(5367t): Updated translationTran Ngoc Quan1-12953/+7839
2022-06-24l10n: fr v2.37 round 1Jean-Noël Avila1-13724/+7931
2022-06-24l10n: Update Catalan translationJordi Mas1-13360/+8338
2022-06-23Documentation/config/transfer.txt: fix typoTaylor Blau1-1/+1
2022-06-23rev-parse: documentation adjustment - mention remote tracking with @{u}Tao Klerks1-9/+6
2022-06-23Git 2.36.2v2.36.2Johannes Schindelin2-5/+11
2022-06-23Git 2.35.4v2.35.4Johannes Schindelin3-2/+9
2022-06-23Git 2.34.4v2.34.4Johannes Schindelin3-2/+8
2022-06-23Git 2.33.4v2.33.4Johannes Schindelin3-2/+8
2022-06-23Git 2.32.3v2.32.3Johannes Schindelin3-2/+8
2022-06-23Git 2.31.4v2.31.4Johannes Schindelin3-2/+8
2022-06-23Git 2.30.5v2.30.5Johannes Schindelin3-2/+14
2022-06-23setup: tighten ownership checks post CVE-2022-24765Carlo Marcelo Arenas Belón1-11/+60
2022-06-23l10n: po-id for 2.37 (first batch)Bagas Sanjaya1-12673/+12990
2022-06-23l10n: tr: v2.37.0 round #1Emir SARI1-12895/+7746
2022-06-23l10n: README: fix typoArthur Milchior1-1/+1
2022-06-23revisions.txt: escape "..." to avoid asciidoc horizontal ellipsisJeff King1-1/+1
2022-06-22l10n: TEAMS: Change German translation team leaderMatthias Rüster1-3/+3
2022-06-22l10n: de.po: Update German translationMatthias Rüster1-13108/+7961
2022-06-22Git 2.37-rc2v2.37.0-rc2Junio C Hamano1-1/+1
2022-06-22l10n: bg.po: Updated Bulgarian translation (5367t)Alexander Shopov1-13314/+8766
2022-06-22l10n: zh_CN: v2.37.0 round 1Fangyi Zhou1-12744/+13006