summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2021-03-08Git 2.31-rc2v2.31.0-rc2Junio C Hamano2-1/+3
2021-03-08Sync with Git 2.30.2 for CVE-2021-21300Junio C Hamano23-4/+292
2021-03-08Merge branch 'jt/transfer-fsck-across-packs-fix'Junio C Hamano2-2/+23
2021-03-05fetch-pack: do not mix --pack_header and packfile uriJonathan Tan2-2/+23
2021-03-04Merged the open-eintr workaround for macOSJunio C Hamano1-0/+5
2021-03-04Documentation/RelNotes: improve release note for rename detection workElijah Newren1-1/+1
2021-03-04Merge branch 'jk/open-returns-eintr'Junio C Hamano5-0/+42
2021-03-04Merge https://github.com/prati0100/git-guiJunio C Hamano2-21/+2
2021-03-04Merge branch 'py/revert-commit-comments'Pratyush Yadav2-21/+2
2021-03-04Revert "git-gui: remove lines starting with the comment character"Pratyush Yadav2-21/+2
2021-03-02Git 2.31-rc1v2.31.0-rc1Junio C Hamano1-1/+1
2021-03-01Hopefully the last batch before -rc1Junio C Hamano1-0/+31
2021-03-01Merge branch 'jh/untracked-cache-fix'Junio C Hamano1-5/+2
2021-03-01Merge branch 'ns/raise-write-index-buffer-size'Junio C Hamano1-1/+1
2021-03-01Merge branch 'hv/trailer-formatting'Junio C Hamano5-103/+236
2021-03-01Merge branch 'hn/reftable-tables-doc-update'Junio C Hamano1-16/+26
2021-03-01Merge branch 'sv/t7001-modernize'Junio C Hamano1-221/+199
2021-03-01Merge branch 'jt/transfer-fsck-across-packs'Junio C Hamano14-51/+229
2021-03-01Merge branch 'ds/chunked-file-api'Junio C Hamano10-468/+655
2021-03-01Merge branch 'en/diffcore-rename'Junio C Hamano4-18/+347
2021-03-01Merge branch 'jh/fsmonitor-prework'Junio C Hamano7-26/+196
2021-03-01Merge https://github.com/prati0100/git-guiJunio C Hamano3-3/+22
2021-03-01Merge branch 'js/commit-graph-warning'Junio C Hamano1-11/+3
2021-03-01Revert "commit-graph: when incompatible with graphs, indicate why"Junio C Hamano1-11/+3
2021-03-01config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big SurJeff King1-0/+3
2021-02-26Makefile: add OPEN_RETURNS_EINTR knobJeff King4-0/+39
2021-02-25Git 2.31-rc0v2.31.0-rc0Junio C Hamano2-1/+50
2021-02-25Merge branch 'jc/push-delete-nothing'Junio C Hamano2-1/+6
2021-02-25Merge branch 'sh/mergetools-vimdiff1'Junio C Hamano1-1/+12
2021-02-25Merge branch 'dl/doc-config-camelcase'Junio C Hamano5-7/+7
2021-02-25Merge branch 'js/params-vs-args'Junio C Hamano6-18/+18
2021-02-25Merge branch 'ug/doc-commit-approxidate'Junio C Hamano1-4/+7
2021-02-25Merge branch 'es/maintenance-of-bare-repositories'Junio C Hamano2-17/+46
2021-02-25Merge branch 'mt/add-chmod-fixes'Junio C Hamano2-10/+54
2021-02-25Merge branch 'ds/merge-base-independent'Junio C Hamano1-25/+165
2021-02-25Merge branch 'ah/rebase-no-fork-point-config'Junio C Hamano3-17/+61
2021-02-25Merge branch 'mt/grep-sparse-checkout'Junio C Hamano3-11/+179
2021-02-25Merge branch 'ah/commit-graph-leakplug'Junio C Hamano1-0/+1
2021-02-25Merge branch 'zh/difftool-skip-to'Junio C Hamano2-0/+40
2021-02-25Merge branch 'cw/pack-config-doc'Junio C Hamano2-1/+19
2021-02-25Merge branch 'jc/maint-column-doc-typofix'Junio C Hamano3-3/+3
2021-02-25Merge branch 'ma/doc-markup-fix'Junio C Hamano3-8/+8
2021-02-25Merge branch 'jc/diffcore-rotate'Junio C Hamano12-1/+197
2021-02-25Merge branch 'mt/checkout-index-corner-cases'Junio C Hamano3-15/+51
2021-02-25Merge branch 'js/doc-proto-v2-response-end'Junio C Hamano1-2/+2
2021-02-25Merge branch 'rs/blame-optim'Junio C Hamano1-5/+3
2021-02-25Merge branch 'mz/doc-notes-are-not-anchors'Junio C Hamano1-6/+8
2021-02-25Merge branch 'ab/detox-gettext-tests'Junio C Hamano104-478/+464
2021-02-25Merge branch 'jk/rev-list-disk-usage'Junio C Hamano8-8/+292
2021-02-24index-format doc: camelCase core.excludesFileJunio C Hamano1-2/+2
2021-02-24blame-options.txt: camelcase blame.blankBoundaryJunio C Hamano1-1/+1
2021-02-24i18n.txt: camel case and monospace "i18n.commitEncoding"Denton Liu3-4/+4
2021-02-24read-cache: make the index write buffer size 128KNeeraj Singh1-1/+1
2021-02-24add: propagate --chmod errors to exit statusMatheus Tavares2-10/+28
2021-02-24add: mark --chmod error string for translationMatheus Tavares2-2/+2
2021-02-24add --chmod: don't update index when --dry-run is usedMatheus Tavares2-3/+29
2021-02-24dir: fix malloc of root untracked_cache_dirJeff Hostetler1-5/+2
2021-02-24rebase: add a config option for --no-fork-pointAlex Henrie3-17/+61
2021-02-24commit-graph.c: display correct number of chunks when writingTaylor Blau1-4/+3
2021-02-23push: do not turn --delete '' into a matching pushJunio C Hamano2-1/+6
2021-02-23doc: mention approxidates for git-commit --dateJeff King1-4/+7
2021-02-23replace "parameters" by "arguments" in error messagesJohannes Sixt6-18/+18
2021-02-23mergetools/vimdiff: add vimdiff1 merge tool variantSeth House1-1/+12
2021-02-23doc/reftable: document how to handle windowsHan-Wen Nienhuys1-16/+26
2021-02-23maintenance: fix incorrect `maintenance.repo` path with bare repositoryEric Sunshine2-17/+46
2021-02-22The tenth batchJunio C Hamano1-0/+7
2021-02-22Merge branch 'ab/test-lib'Junio C Hamano41-124/+107
2021-02-22Merge branch 'ab/diff-deferred-free'Junio C Hamano4-20/+60
2021-02-22Merge branch 'ab/pager-exit-log'Junio C Hamano3-13/+142
2021-02-22Merge branch 'ta/hash-function-transition-doc'Junio C Hamano2-147/+150
2021-02-22Merge branch 'bc/signed-objects-with-both-hashes'Junio C Hamano12-74/+225
2021-02-22Merge branch 'dl/stash-cleanup'Junio C Hamano3-97/+105
2021-02-22commit-graph: avoid leaking topo_levels slab in write_commit_graph()Andrzej Hunt1-0/+1
2021-02-22difftool.c: learn a new way start at specified fileZheNing Hu2-0/+40
2021-02-22commit-reach: stale commits may prune generation furtherDerrick Stolee1-7/+21
2021-02-22commit-reach: use heuristic in remove_redundant()Derrick Stolee1-16/+56
2021-02-22commit-reach: move compare_commits_by_genDerrick Stolee1-15/+15
2021-02-22commit-reach: use one walk in remove_redundant()Derrick Stolee1-8/+96
2021-02-22doc: mention bigFileThreshold for packingChristian Walther2-1/+19
2021-02-22fetch-pack: print and use dangling .gitmodulesJonathan Tan9-22/+165
2021-02-22fetch-pack: with packfile URIs, use index-pack argJonathan Tan1-11/+23
2021-02-22http-fetch: allow custom index-pack argsJonathan Tan4-8/+30
2021-02-22http: allow custom index-pack argsJonathan Tan3-13/+18
2021-02-22Merge branch 'py/commit-comments'Pratyush Yadav2-2/+21
2021-02-19Documentation: typofix --column descriptionJunio C Hamano3-3/+3
2021-02-18chunk-format: add technical docsDerrick Stolee3-0/+122
2021-02-18chunk-format: restore duplicate chunk checksDerrick Stolee1-0/+9
2021-02-18midx: use 64-bit multiplication for chunk sizesDerrick Stolee1-5/+6
2021-02-18midx: use chunk-format read APIDerrick Stolee2-50/+29
2021-02-18commit-graph: use chunk-format read APIDerrick Stolee2-106/+55
2021-02-18chunk-format: create read chunk APIDerrick Stolee2-0/+127
2021-02-18midx: use chunk-format API in write_midx_internal()Derrick Stolee1-86/+20
2021-02-18midx: drop chunk progress during writeDerrick Stolee1-7/+0
2021-02-18midx: return success/failure in chunk write methodsDerrick Stolee1-36/+27
2021-02-18midx: add num_large_offsets to write_midx_contextDerrick Stolee1-7/+10
2021-02-18midx: add pack_perm to write_midx_contextDerrick Stolee1-19/+21
2021-02-18midx: add entries to write_midx_contextDerrick Stolee1-23/+26
2021-02-18midx: use context in write_midx_pack_names()Derrick Stolee1-11/+10
2021-02-18midx: rename pack_info to write_midx_contextDerrick Stolee1-65/+65
2021-02-18commit-graph: use chunk-format write APIDerrick Stolee1-82/+37
2021-02-18chunk-format: create chunk format write APIDerrick Stolee3-0/+112
2021-02-18gitmailmap.txt: fix rendering of e-mail addressesMartin Ågren1-4/+4
2021-02-18git.txt: fix monospace renderingMartin Ågren1-1/+1
2021-02-18git-gui: remove lines starting with the comment characterPratyush Yadav2-2/+21
2021-02-17The ninth batchJunio C Hamano1-0/+58
2021-02-17Merge branch 'ak/config-bad-bool-error'Junio C Hamano2-2/+25
2021-02-17Merge branch 'js/reflog-expire-stale-fix'Junio C Hamano2-0/+29
2021-02-17Merge branch 'js/commit-graph-warning'Junio C Hamano1-3/+11
2021-02-17Merge branch 'ew/rev-parse-since-test'Junio C Hamano1-0/+15
2021-02-17Merge branch 'ds/maintenance-pack-refs'Junio C Hamano4-6/+54
2021-02-17Merge branch 'jx/t5411-unique-filenames'Junio C Hamano31-362/+224
2021-02-17Merge branch 'js/fsck-name-objects-fix'Junio C Hamano2-14/+17
2021-02-17Merge branch 'jk/mailmap-only-at-root'Junio C Hamano3-1/+49
2021-02-17Merge branch 'mt/grep-cached-untracked'Junio C Hamano1-0/+3
2021-02-17Merge branch 'sh/mergetool-hideresolved'Junio C Hamano6-3/+101
2021-02-17Merge branch 'jt/trace2-BUG'Junio C Hamano3-0/+39
2021-02-17Merge branch 'js/range-diff-one-side-only'Junio C Hamano7-61/+120
2021-02-17Merge branch 'js/range-diff-wo-dotdot'Junio C Hamano6-5/+65
2021-02-17Merge branch 'jt/clone-unborn-head'Junio C Hamano20-63/+240
2021-02-17Merge branch 'mr/bisect-in-c-4'Junio C Hamano2-86/+155
2021-02-17Merge branch 'ds/commit-graph-genno-fix'Junio C Hamano3-39/+125
2021-02-17Merge branch 'ak/corrected-commit-date'Junio C Hamano19-154/+667
2021-02-17doc: fix naming of response-end-pktJoey Salazar1-2/+2
2021-02-17docs/rev-list: add some examples of --disk-usageJeff King1-0/+41
2021-02-17docs/rev-list: add an examples sectionJeff King1-0/+52
2021-02-17rev-list-options.txt: fix rendering of bonus paragraphMartin Ågren1-3/+3
2021-02-17blame: remove unnecessary use of get_commit_info()Rafael Silva1-5/+3
2021-02-16fsmonitor: refactor initialization of fsmonitor_last_update tokenJeff Hostetler1-3/+32
2021-02-16fsmonitor: allow all entries for a folder to be invalidatedKevin Willford1-5/+26
2021-02-16fsmonitor: log FSMN token when reading and writing the indexJeff Hostetler1-2/+10
2021-02-16fsmonitor: log invocation of FSMonitor hook to trace2Jeff Hostetler2-1/+33
2021-02-16read-cache: log the number of scanned files to trace2Jeff Hostetler1-3/+10
2021-02-16read-cache: log the number of lstat calls to trace2Jeff Hostetler1-3/+14
2021-02-16preload-index: log the number of lstat calls to trace2Jeff Hostetler1-0/+10
2021-02-16p7519: add trace logging during perf testJeff Hostetler3-2/+35
2021-02-16p7519: move watchman cleanup earlier in the testJeff Hostetler1-8/+17
2021-02-16p7519: fix watchman watch-list test on WindowsJeff Hostetler1-1/+1
2021-02-16p7519: do not rely on "xargs -d" in testJeff Hostetler1-1/+11
2021-02-16checkout-index: omit entries with no tempname from --temp outputMatheus Tavares1-11/+24
2021-02-16write_entry(): fix misuses of `path` in error messagesMatheus Tavares2-4/+27
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano12-1/+197
2021-02-15merge-ort: call diffcore_rename() directlyElijah Newren1-7/+59
2021-02-15gitdiffcore doc: mention new preliminary step for rename detectionElijah Newren1-0/+20
2021-02-15diffcore-rename: guide inexact rename detection based on basenamesElijah Newren2-8/+52
2021-02-15diffcore-rename: complete find_basename_matches()Elijah Newren1-3/+79
2021-02-15diffcore-rename: compute basenames of source and dest candidatesElijah Newren1-0/+63
2021-02-15t4001: add a test comparing basename similarity and content similarityElijah Newren1-0/+23
2021-02-15diffcore-rename: filter rename_src list when possibleElijah Newren1-8/+51
2021-02-15ref-filter: use pretty.c logic for trailersHariom Verma3-21/+118
2021-02-15pretty.c: capture invalid trailer argumentHariom Verma2-5/+15
2021-02-15pretty.c: refactor trailer logic to `format_set_trailers_options()`Hariom Verma2-39/+61
2021-02-15t6300: use function to test trailer optionsHariom Verma1-43/+47
2021-02-12The eighth batchJunio C Hamano1-0/+21
2021-02-12Merge branch 'tb/precompose-prefix-too'Junio C Hamano11-29/+59
2021-02-12Merge branch 'jk/complete-branch-force-delete'Junio C Hamano2-4/+6
2021-02-12Merge branch 'jv/upload-pack-filter-spec-quotefix'Junio C Hamano2-8/+11
2021-02-12Merge branch 'tb/pack-revindex-on-disk'Junio C Hamano22-42/+545
2021-02-12Merge branch 'ab/tests-various-fixup'Junio C Hamano5-67/+80
2021-02-12diffcore-rename: no point trying to find a match better than exactElijah Newren1-6/+14
2021-02-12test-lib-functions: assert correct parameter countÆvar Arnfjörð Bjarmason1-0/+8
2021-02-12test-lib-functions: remove bug-inducing "diagnostics" helper paramÆvar Arnfjörð Bjarmason5-16/+26
2021-02-12test libs: rename "diff-lib" to "lib-diff"Ævar Arnfjörð Bjarmason23-30/+30
2021-02-12Git 2.30.2v2.30.2Johannes Schindelin3-2/+10
2021-02-12Sync with 2.29.3Johannes Schindelin22-4/+284
2021-02-12Git 2.29.3v2.29.3Johannes Schindelin3-2/+10
2021-02-12Sync with 2.28.1Johannes Schindelin21-4/+277
2021-02-12Git 2.28.1v2.28.1Johannes Schindelin3-2/+9
2021-02-12Sync with 2.27.1Johannes Schindelin20-4/+270
2021-02-12Git 2.27.1v2.27.1Johannes Schindelin3-2/+9
2021-02-12Sync with 2.26.3Johannes Schindelin19-4/+263
2021-02-12Git 2.26.3v2.26.3Johannes Schindelin3-2/+9
2021-02-12Sync with 2.25.5Johannes Schindelin18-4/+256
2021-02-12Git 2.25.5v2.25.5Johannes Schindelin3-2/+9
2021-02-12Sync with 2.24.4Johannes Schindelin17-4/+249
2021-02-12Git 2.24.4v2.24.4Johannes Schindelin3-2/+9
2021-02-12Sync with 2.23.4Johannes Schindelin16-4/+242
2021-02-12Git 2.23.4v2.23.4Johannes Schindelin3-2/+9
2021-02-12Sync with 2.22.5Johannes Schindelin15-4/+235
2021-02-12Git 2.22.5v2.22.5Johannes Schindelin3-2/+9
2021-02-12Sync with 2.21.4Johannes Schindelin14-4/+228
2021-02-12Git 2.21.4v2.21.4Johannes Schindelin3-2/+8
2021-02-12Sync with 2.20.5Johannes Schindelin13-4/+222
2021-02-12Git 2.20.5v2.20.5Johannes Schindelin3-2/+8
2021-02-12Sync with 2.19.6Johannes Schindelin12-4/+216
2021-02-12Git 2.19.6v2.19.6Johannes Schindelin3-2/+8
2021-02-12Sync with 2.18.5Johannes Schindelin11-4/+210
2021-02-12Git 2.18.5v2.18.5Johannes Schindelin3-2/+8
2021-02-12Sync with 2.17.6Johannes Schindelin10-4/+204
2021-02-12Git 2.17.6v2.17.6Johannes Schindelin3-2/+18
2021-02-12unpack_trees(): start with a fresh lstat cacheMatheus Tavares1-0/+3
2021-02-12run-command: invalidate lstat cache after a command finishedJohannes Schindelin2-1/+44
2021-02-12checkout: fix bug that makes checkout follow symlinks in leading pathMatheus Tavares7-3/+141
2021-02-11Sync with maintJunio C Hamano0-0/+0
2021-02-11Merge branch 'en/merge-ort-perf'Junio C Hamano2-1/+94
2021-02-11Merge branch 'en/ort-directory-rename'Junio C Hamano1-19/+811
2021-02-11Merge branch 'tb/ci-run-cocci-with-18.04' into maintJunio C Hamano1-1/+1
2021-02-11config: improve error message for boolean configAndrew Klotz2-2/+25
2021-02-11t7001: use `test` rather than `[`Shubham Verma1-8/+8
2021-02-11t7001: use here-docs instead of echoShubham Verma1-1/+4
2021-02-11t7001: put each command on a separate lineShubham Verma1-1/+3