summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2022-08-10Git 2.37.2v2.37.2Junio C Hamano2-1/+25
2022-08-10Merge branch 'jc/string-list-cleanup' into maintJunio C Hamano1-2/+1
2022-08-10Merge branch 'mt/pkt-line-comment-tweak' into maintJunio C Hamano1-8/+8
2022-08-10Merge branch 'ma/t4200-update' into maintJunio C Hamano1-3/+0
2022-08-10Merge branch 'tb/commit-graph-genv2-upgrade-fix' into maintJunio C Hamano4-8/+56
2022-08-10Merge branch 'tk/untracked-cache-with-uall' into maintJunio C Hamano2-0/+7
2022-08-10Merge branch 'mt/checkout-count-fix' into maintJunio C Hamano10-24/+113
2022-08-10Merge branch 'cl/rerere-train-with-no-sign' into maintJunio C Hamano1-1/+1
2022-08-10Merge branch 'kk/p4-client-name-encoding-fix' into maintJunio C Hamano1-9/+42
2022-08-10Merge branch 'mb/p4-utf16-crlf' into maintJunio C Hamano1-1/+1
2022-08-10Merge branch 'hx/lookup-commit-in-graph-fix' into maintJunio C Hamano2-1/+48
2022-08-10Merge branch 'jc/resolve-undo' into maintJunio C Hamano3-0/+146
2022-08-05Downmerge a bit more for 2.37.xJunio C Hamano1-0/+17
2022-08-05Merge branch 'sg/index-format-doc-update' into maintJunio C Hamano1-2/+0
2022-08-05Merge branch 'ma/sparse-checkout-cone-doc-fix' into maintJunio C Hamano1-2/+2
2022-08-05Merge branch 'ds/win-syslog-compiler-fix' into maintJunio C Hamano1-3/+4
2022-08-05Merge branch 'ld/osx-keychain-usage-fix' into maintJunio C Hamano1-1/+1
2022-08-05Merge branch 'ds/doc-wo-whitelist' into maintJunio C Hamano11-40/+39
2022-08-05Merge branch 'mb/config-document-include' into maintJunio C Hamano3-0/+21
2022-08-05Merge branch 'rs/mingw-tighten-mkstemp' into maintJunio C Hamano1-4/+1
2022-08-05Merge branch 'jk/clone-unborn-confusion' into maintJunio C Hamano3-39/+117
2022-07-27Downmerge a handful of fixes for 2.37.x maintenance trackJunio C Hamano2-1/+48
2022-07-27Merge branch 'tk/rev-parse-doc-clarify-at-u' into maintJunio C Hamano1-9/+6
2022-07-27Merge branch 'll/ls-files-tests-update' into maintJunio C Hamano5-71/+132
2022-07-27Merge branch 'ds/t5510-brokequote' into maintJunio C Hamano1-1/+5
2022-07-27Merge branch 'tb/pack-objects-remove-pahole-comment' into maintJunio C Hamano1-10/+0
2022-07-27Merge branch 'en/t6429-test-must-be-empty-fix' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'ds/vscode-settings' into maintJunio C Hamano1-2/+6
2022-07-27Merge branch 'cr/setup-bug-typo' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'pb/diff-doc-raw-format' into maintJunio C Hamano2-6/+6
2022-07-27Merge branch 'jk/revisions-doc-markup-fix' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'rs/combine-diff-with-incompatible-options' into maintJunio C Hamano1-0/+7
2022-07-27Merge branch 'ac/bitmap-format-doc' into maintJunio C Hamano2-96/+108
2022-07-27Merge branch 'ab/test-quoting-fix' into maintJunio C Hamano5-7/+8
2022-07-27Merge branch 'ro/mktree-allow-missing-fix' into maintJunio C Hamano1-2/+9
2022-07-27Merge branch 'dr/i18n-die-warn-error-usage' into maintJunio C Hamano1-4/+4
2022-07-27Merge branch 'ds/git-rebase-doc-markup' into maintJunio C Hamano1-120/+122
2022-07-27Merge branch 'gg/worktree-from-the-above' into maintJunio C Hamano2-7/+293
2022-07-27Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano1-18/+18
2022-07-27Merge branch 'en/merge-dual-dir-renames-fix' into maintJunio C Hamano2-26/+153
2022-07-27Merge branch 'jk/diff-files-cleanup-fix' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano1-4/+35
2022-07-27Merge branch 'js/shortlog-sort-stably' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'js/ci-github-workflow-markup' into maintJunio C Hamano1-5/+5
2022-07-22read-cache: make `do_read_index()` always set up `istate->repo`Martin Ågren2-1/+9
2022-07-22pkt-line.h: move comment closer to the associated codeMatheus Tavares1-8/+8
2022-07-21git-p4: refactoring of p4CmdList()Kilian Kilger1-11/+42
2022-07-20builtin/remote.c: use the right kind of STRING_LIST_INITJunio C Hamano1-2/+1
2022-07-20git-p4: fix CR LF handling for utf16 filesMoritz Baumann1-1/+1
2022-07-19compat/win32: correct for incorrect compiler warningDerrick Stolee1-3/+4
2022-07-19transport.c: avoid "whitelist"Derrick Stolee1-4/+4
2022-07-19t: avoid "whitelist"Derrick Stolee4-8/+7
2022-07-19git.txt: remove redundant languageDerrick Stolee1-3/+1
2022-07-19git-cvsserver: clarify directory listDerrick Stolee3-11/+12
2022-07-19daemon: clarify directory argumentsDerrick Stolee2-14/+15
2022-07-19osx-keychain: fix compiler warningLessley Dennington1-1/+1
2022-07-19contrib/rerere-train: avoid useless gpg sign in trainingCeleste Liu1-1/+1
2022-07-18t4200: drop irrelevant codeMartin Ågren1-3/+0
2022-07-18config/core.txt: fix minor issues for `core.sparseCheckoutCone`Martin Ågren1-2/+2
2022-07-18index-format.txt: remove outdated list of supported extensionsSZEDER Gábor1-2/+0
2022-07-17config.txt: document include, includeIfManuel Boni3-0/+21
2022-07-15commit-graph: fix corrupt upgrade from generation v1 to v2Taylor Blau2-6/+6
2022-07-15commit-graph: introduce `repo_find_commit_pos_in_graph()`Taylor Blau2-3/+24
2022-07-15t5318: demonstrate commit-graph generation v2 corruptionTaylor Blau1-0/+27
2022-07-14mingw: avoid mktemp() in mkstemp() implementationRené Scharfe1-4/+1
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-14checkout: fix two bugs on the final count of updated entriesMatheus Tavares9-25/+40
2022-07-14checkout: show bug about failed entries being included in final reportMatheus Tavares2-1/+53
2022-07-14checkout: document bug where delayed checkout counts entries twiceMatheus Tavares1-0/+22
2022-07-14tests: fix incorrect --write-junit-xml codeJohannes Schindelin1-5/+5
2022-07-12t5330: remove run_with_limited_processses()Han Xin1-24/+1
2022-07-12diff-files: move misplaced cleanup labelJeff King1-1/+1
2022-07-11fsck: do not dereference NULL while checking resolve-undo dataJunio C Hamano1-0/+1
2022-07-11clone: move unborn head creation to update_head()Jeff King1-12/+15
2022-07-08vimdiff: make layout engine more robust against user vim settingsFernando Ramos1-18/+18
2022-07-08git-p4: fix bug with encoding of p4 client nameKilian Kilger1-2/+4
2022-07-07clone: use remote branch if it matches default HEADJeff King3-6/+48
2022-07-07clone: propagate empty remote HEAD even with other branchesJeff King2-22/+55
2022-07-07clone: drop extra newline from warning messageJeff King1-1/+1
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-04Merge 'js/add-i-delete' into maint-2.37Junio C Hamano2-2/+19
2022-06-30t6429: fix use of non-existent functionElijah Newren1-1/+1
2022-06-30commit-graph.c: no lazy fetch in lookup_commit_in_graph()Han Xin2-1/+71
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-28pack-objects.h: remove outdated pahole resultsTaylor Blau1-10/+0
2022-06-28add --interactive: allow `update` to stage deleted filesJohannes Schindelin2-2/+19
2022-06-27vscode: improve tab size and wrappingDerrick Stolee1-2/+6
2022-06-27Sync with Git 2.36.2Junio C Hamano9-19/+117
2022-06-27Git 2.37v2.37.0Junio C Hamano1-1/+1
2022-06-27Merge branch 'jc/revert-show-parent-info'Junio C Hamano2-1/+3
2022-06-27Merge tag 'l10n-2.37.0-rnd1' of https://github.com/git-l10n/git-poJunio C Hamano14-161382/+114332
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-26Merge branch 'l10n/zh_TW/220623' of github.com:l10n-tw/git-poJiang Xin1-13955/+12996
2022-06-25l10n: zh_TW: v2.37.0 round 1Yi-Jyun Pan1-13955/+12996
2022-06-25Merge branch 'master' of github.com:vnwildman/gitJiang Xin1-12953/+7839
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-23Merge branch 'ab/credentials-in-url-more'Junio C Hamano1-1/+1
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-23Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin1-12673/+12990
2022-06-23Git 2.36.2v2.36.2Johannes Schindelin2-5/+11
2022-06-23Sync with 2.35.4Johannes Schindelin11-12/+282
2022-06-23Git 2.35.4v2.35.4Johannes Schindelin3-2/+9
2022-06-23Sync with 2.34.4Johannes Schindelin10-12/+275
2022-06-23Git 2.34.4v2.34.4Johannes Schindelin3-2/+8
2022-06-23Sync with 2.33.4Johannes Schindelin9-12/+269
2022-06-23Git 2.33.4v2.33.4Johannes Schindelin3-2/+8
2022-06-23Sync with 2.32.3Johannes Schindelin8-12/+263
2022-06-23Git 2.32.3v2.32.3Johannes Schindelin3-2/+8
2022-06-23Sync with 2.31.4Johannes Schindelin7-12/+257
2022-06-23Git 2.31.4v2.31.4Johannes Schindelin3-2/+8
2022-06-23Sync with 2.30.5Johannes Schindelin6-12/+251
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-23Merge branch 'cb/path-owner-check-with-sudo'Junio C Hamano4-1/+179
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-23Merge branch 'master' of github.com:ruester/git-po-deJiang Xin2-13111/+7964
2022-06-23Merge branch 'master' of github.com:alshopov/git-poJiang Xin1-13314/+8766
2022-06-23Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poJiang Xin1-12744/+13006
2022-06-23l10n: README: fix typoArthur Milchior1-1/+1
2022-06-22revisions.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-22Merge branch 'tb/cruft-packs'Junio C Hamano1-2/+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
2022-06-22Merge branch 'master' of github.com:git/gitJiang Xin3-17/+19
2022-06-21dir: minor refactoring / clean-upGoss Geppert1-7/+9
2022-06-21dir: traverse into repositoryGoss Geppert2-0/+284
2022-06-21t5510: replace 'origin' with URL more carefullyDerrick Stolee1-1/+5
2022-06-21mktree: do not check type of remote objectsRichard Oliver1-2/+9
2022-06-21Merge branch 'jp/prompt-clear-before-upstream-mark'Junio C Hamano2-16/+18
2022-06-21i18n: mark message helpers prefix for translationDimitriy Ryazantcev1-4/+4
2022-06-21combine-diff: abort if --output is givenRené Scharfe1-0/+3
2022-06-21combine-diff: abort if --ignore-matching-lines is givenRené Scharfe1-0/+4
2022-06-21gc: simplify --cruft descriptionRené Scharfe1-2/+1
2022-06-20name-rev: prefix annotate-stdin with '--' in messageAlexander Shopov1-1/+1
2022-06-18Merge branch 'master' of github.com:git/gitJiang Xin36-142/+169
2022-06-17Git 2.37-rc1v2.37.0-rc1Junio C Hamano2-4/+3
2022-06-17Merge branch 'cb/path-owner-check-with-sudo-plus'Junio C Hamano3-18/+11
2022-06-17setup: fix function name in a BUG() messageCleber Rosa1-1/+1
2022-06-17git-compat-util: allow root to access both SUDO_UID and root ownedCarlo Marcelo Arenas Belón3-18/+11
2022-06-17i18n: fix mismatched camelCase config variablesJiang Xin11-11/+11
2022-06-17Another batch of fixes before -rc1Junio C Hamano2-2/+5
2022-06-17Merge branch 'jk/bug-fl-va-list-fix'Junio C Hamano2-5/+7
2022-06-17Merge branch 'ab/credentials-in-url-more'Junio C Hamano6-30/+56
2022-06-17Merge branch 'js/ci-github-workflow-markup'Junio C Hamano3-4/+27
2022-06-17Merge branch 'js/misc-fixes'Junio C Hamano6-11/+17
2022-06-17Merge branch 'jc/cocci-cleanup'Junio C Hamano1-12/+0
2022-06-17Merge branch 'ds/more-test-coverage'Junio C Hamano5-47/+34
2022-06-17Merge branch 'jk/perf-lib-test-titles'Junio C Hamano1-1/+1
2022-06-17Merge branch 'master' of github.com:git/gitJiang Xin1-1/+1
2022-06-16bug_fl(): correctly initialize trace2 va_listJeff King2-5/+7
2022-06-16relative_url(): fix incorrect conditionJohannes Schindelin1-1/+1
2022-06-16pack-mtimes: avoid closing a bogus file descriptorJohannes Schindelin1-1/+2
2022-06-16read_index_from(): avoid memory leakJohannes Schindelin1-3/+3
2022-06-16submodule--helper: avoid memory leak when fetching submodulesJohannes Schindelin1-0/+1
2022-06-16submodule-config: avoid memory leakJohannes Schindelin1-4/+4
2022-06-16fsmonitor: avoid memory leak in `fsm_settings__get_incompatible_msg()`Johannes Schindelin1-2/+6
2022-06-16cache-tree: remove cache_tree_find_path()Derrick Stolee2-29/+0
2022-06-16pack-write: drop always-NULL parameterDerrick Stolee1-11/+6
2022-06-16t5329: test 'git gc --cruft' without '--prune=now'Derrick Stolee1-1/+3
2022-06-16t2107: test 'git update-index --verbose'Derrick Stolee1-6/+25
2022-06-16perf-lib: fix missing test titles in outputJeff King1-1/+1
2022-06-16bitmap-format.txt: add information for trailing checksumAbhradeep Chakraborty1-0/+4
2022-06-16bitmap-format.txt: fix some formatting issuesAbhradeep Chakraborty1-96/+103
2022-06-16bitmap-format.txt: feed the file to asciidoc to generate htmlAbhradeep Chakraborty1-0/+1
2022-06-16builtin/rebase: remove a redundant space in l10n stringFangyi Zhou1-1/+1
2022-06-16l10n: es: update translationAlex Henrie1-13893/+8767
2022-06-15Fixes and updates post -rc0Junio C Hamano1-5/+16
2022-06-15Merge branch 'fs/ssh-default-key-command-doc'Junio C Hamano1-3/+6
2022-06-15Merge branch 'po/rebase-preserve-merges'Junio C Hamano1-5/+9
2022-06-15Merge branch 'jc/revert-show-parent-info'Junio C Hamano6-5/+85
2022-06-15tests: add LIBCURL prerequisite to tests needing libcurlÆvar Arnfjörð Bjarmason4-5/+6
2022-06-15push: fix capitalisation of the option name autoSetupMergeFangyi Zhou1-1/+1
2022-06-15transfer doc: move fetch.credentialsInUrl to "transfer" config namespaceÆvar Arnfjörð Bjarmason6-51/+53
2022-06-15fetch doc: note "pushurl" caveat about "credentialsInUrl", elaborateÆvar Arnfjörð Bjarmason2-7/+31
2022-06-15add -i tests: mark "TODO" depending on GIT_TEST_ADD_I_USE_BUILTINÆvar Arnfjörð Bjarmason3-3/+15
2022-06-13Git 2.37-rc0v2.37.0-rc0Junio C Hamano1-0/+37
2022-06-13Merge branch 'gc/document-config-worktree-scope'Junio C Hamano2-1/+10
2022-06-13Merge branch 'js/wait-or-whine-can-fail'Junio C Hamano1-1/+2
2022-06-13Merge branch 'ab/remote-free-fix'Junio C Hamano1-7/+4
2022-06-13Merge branch 'sn/fsmonitor-missing-clock'Junio C Hamano1-2/+3
2022-06-13Merge branch 'zh/read-cache-copy-name-entry-fix'Junio C Hamano1-2/+0