summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-24rebase: add a config option for --no-fork-pointAlex Henrie3-17/+61
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-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-19Documentation: typofix --column descriptionJunio C Hamano3-3/+3
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-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-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-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-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-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-11stash: declare ref_stash as an arrayDenton Liu1-1/+1
2021-02-11t3905: use test_cmp() to check file contentsDenton Liu1-2/+4
2021-02-11t3905: replace test -s with test_file_not_emptyDenton Liu1-6/+6
2021-02-11t3905: remove nested git in command substitutionDenton Liu1-3/+6
2021-02-11t3905: move all commands into test casesDenton Liu1-72/+75
2021-02-11t3905: remove spaces after redirect operatorsDenton Liu1-20/+20
2021-02-11git-stash.txt: be explicit about subcommand optionsDenton Liu1-4/+4
2021-02-11rev-list: add --disk-usage option for calculating disk usageJeff King5-0/+189
2021-02-11commit-graph: when incompatible with graphs, indicate whyJohannes Schindelin1-3/+11
2021-02-11reflog expire --stale-fix: be generous about missing objectsJohannes Schindelin2-0/+29
2021-02-11diff: plug memory leak from regcomp() on {log,diff} -IÆvar Arnfjörð Bjarmason1-0/+12
2021-02-11diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason4-20/+48
2021-02-10tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason90-415/+415
2021-02-10tests: remove last uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason3-14/+4
2021-02-10tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason17-41/+41
2021-02-10tests: remove last uses of GIT_TEST_GETTEXT_POISON=falseÆvar Arnfjörð Bjarmason1-8/+4
2021-02-10docs: clarify that refs/notes/ do not keep the attached objects aliveMartin von Zweigbergk1-6/+8
2021-02-10gpg-interface: remove other signature headers before verifyingbrian m. carlson2-0/+27
2021-02-10ref-filter: hoist signature parsingbrian m. carlson1-4/+3
2021-02-10commit: allow parsing arbitrary buffers with headersbrian m. carlson2-4/+25
2021-02-10gpg-interface: improve interface for parsing tagsbrian m. carlson9-39/+87
2021-02-10Merge branch 'tb/ci-run-cocci-with-18.04'Junio C Hamano1-1/+1
2021-02-10The seventh batchJunio C Hamano1-34/+25
2021-02-10Merge branch 'ab/detox-gettext-tests'Junio C Hamano22-173/+29
2021-02-10Merge branch 'ab/grep-pcre-invalid-utf8'Junio C Hamano7-8/+82
2021-02-10Merge branch 'ab/retire-pcre1'Junio C Hamano8-216/+18
2021-02-10Merge branch 'jk/pretty-lazy-load-commit'Junio C Hamano2-12/+13
2021-02-10Merge branch 'ds/more-index-cleanups'Junio C Hamano15-53/+408
2021-02-10Merge branch 'rs/worktree-list-verbose'Junio C Hamano5-80/+314
2021-02-10Merge branch 'js/rebase-i-commit-cleanup-fix'Junio C Hamano2-1/+20
2021-02-10Merge branch 'jk/t0000-cleanups'Junio C Hamano1-286/+284
2021-02-10Merge branch 'sg/t7800-difftool-robustify'Junio C Hamano1-19/+19
2021-02-10Merge branch 'ab/lose-grep-debug'Junio C Hamano4-107/+2
2021-02-10Merge branch 'jk/use-oid-pos'Junio C Hamano10-94/+87
2021-02-10t1500: ensure current --since= behavior remainsEric Wong1-0/+15
2021-02-10t/.gitattributes: sort linesÆvar Arnfjörð Bjarmason1-1/+1
2021-02-10test-lib-functions: move function to lib-bitmap.shÆvar Arnfjörð Bjarmason4-27/+29
2021-02-10test libs: rename gitweb-lib.sh to lib-gitweb.shÆvar Arnfjörð Bjarmason4-3/+3
2021-02-10test libs: rename bundle helper to "lib-bundle.sh"Ævar Arnfjörð Bjarmason3-2/+2
2021-02-10test-lib-functions: remove generate_zero_bytes() wrapperÆvar Arnfjörð Bjarmason2-8/+1
2021-02-10test-lib-functions: move test_set_index_version() to its userÆvar Arnfjörð Bjarmason2-5/+5
2021-02-10test lib: change "error" to "BUG" as appropriateÆvar Arnfjörð Bjarmason1-2/+2
2021-02-10test-lib: remove check_var_migrationÆvar Arnfjörð Bjarmason1-30/+0
2021-02-10mailmap: only look for .mailmap in work treeJeff King3-1/+49
2021-02-10fsck --name-objects: be more careful parsing generation numbersJohannes Schindelin2-4/+11
2021-02-10t1450: robustify `remove_object()`Johannes Schindelin1-10/+6
2021-02-09grep: honor sparse-checkout on working tree searchesMatheus Tavares3-11/+179
2021-02-09maintenance: incremental strategy runs pack-refs weeklyDerrick Stolee3-2/+19
2021-02-09maintenance: add pack-refs taskDerrick Stolee3-4/+35
2021-02-09usage: trace2 BUG() invocationsJonathan Tan3-0/+39
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagSeth House3-1/+44
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House4-3/+16
2021-02-09mergetool: add hideResolved configurationSeth House3-0/+42
2021-02-09t: add --no-tag option to test_commitJeff King2-8/+10
2021-02-09grep: error out if --untracked is used with --cachedMatheus Tavares1-0/+3
2021-02-08Sync with 2.30.1Junio C Hamano1-0/+8
2021-02-08.github/workflows/main.yml: run static-analysis on bionicTaylor Blau1-1/+1
2021-02-08Git 2.30.1v2.30.1Junio C Hamano2-1/+9
2021-02-08Merge branch 'pb/ci-matrix-wo-shortcut' into maintJunio C Hamano1-0/+4
2021-02-08Merge branch 'pb/blame-funcname-range-userdiff' into maintJunio C Hamano1-4/+4
2021-02-08Merge branch 'jk/p5303-sed-portability-fix' into maintJunio C Hamano1-4/+8
2021-02-08Merge branch 'ab/branch-sort' into maintJunio C Hamano8-44/+111
2021-02-08Merge branch 'ma/more-opaque-lock-file' into maintJunio C Hamano5-15/+15
2021-02-08Merge branch 'dl/p4-encode-after-kw-expansion' into maintJunio C Hamano1-1/+1
2021-02-08Merge branch 'ar/t6016-modernise' into maintJunio C Hamano1-187/+167
2021-02-08Merge branch 'zh/arg-help-format' into maintJunio C Hamano8-64/+64
2021-02-08Merge branch 'ma/doc-pack-format-varint-for-sizes' into maintJunio C Hamano1-1/+16
2021-02-08Merge branch 'ma/t1300-cleanup' into maintJunio C Hamano1-40/+32
2021-02-08Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files' into maintJunio C Hamano1-8/+8
2021-02-06range-diff(docs): explain how to specify commit rangesJohannes Schindelin1-0/+11
2021-02-06range-diff/format-patch: handle commit ranges other than A..BJohannes Schindelin3-4/+39
2021-02-06range-diff: offer --left-only/--right-only optionsJohannes Schindelin5-4/+40
2021-02-06range-diff: move the diffopt initialization down one layerJohannes Schindelin1-33/+31
2021-02-06range-diff: combine all options in a single data structureJohannes Schindelin5-23/+42
2021-02-05Sync with maintJunio C Hamano1-0/+47
2021-02-05The sixth batchJunio C Hamano1-0/+40
2021-02-05Merge branch 'sg/test-stress-jobs'Junio C Hamano1-4/+4
2021-02-05Merge branch 'jk/weather-balloon-require-variadic-macro'Junio C Hamano1-2/+5
2021-02-05Merge branch 'pb/ci-matrix-wo-shortcut'Junio C Hamano1-0/+4
2021-02-05Merge branch 'pb/blame-funcname-range-userdiff'Junio C Hamano1-4/+4
2021-02-05Merge branch 'jk/p5303-sed-portability-fix'Junio C Hamano1-4/+8
2021-02-05Merge branch 'jv/pack-objects-narrower-ref-iteration'Junio C Hamano1-5/+3
2021-02-05Merge branch 'ph/use-delete-refs'Junio C Hamano2-29/+62
2021-02-05Merge branch 'tb/ls-refs-optim'Junio C Hamano4-73/+103
2021-02-05Merge branch 'zh/ls-files-deduplicate'Junio C Hamano3-31/+124
2021-02-05Merge branch 'ds/cache-tree-basics'Junio C Hamano5-18/+94
2021-02-05Merge branch 'en/ort-conflict-handling'Junio C Hamano1-18/+653
2021-02-05Merge branch 'so/log-diff-merge'Junio C Hamano21-116/+893
2021-02-05Prepare for 2.30.1Junio C Hamano3-2/+49
2021-02-05Merge branch 'js/skip-dashed-built-ins-from-config-mak' into maintJunio C Hamano1-14/+14
2021-02-05Merge branch 'jt/packfile-as-uri-doc' into maintJunio C Hamano1-2/+5
2021-02-05Merge branch 'ab/fsck-doc-fix' into maintJunio C Hamano1-8/+0
2021-02-05Merge branch 'jk/log-cherry-pick-duplicate-patches' into maintJunio C Hamano4-4/+48
2021-02-05Merge branch 'jk/forbid-lf-in-git-url' into maintJunio C Hamano4-1/+23
2021-02-05Merge branch 'jc/macos-install-dependencies-fix' into maintJunio C Hamano1-4/+4
2021-02-05Merge branch 'tb/local-clone-race-doc' into maintJunio C Hamano1-0/+4
2021-02-05Merge branch 'bc/doc-status-short' into maintJunio C Hamano1-8/+20
2021-02-05Merge branch 'ab/gettext-charset-comment-fix' into maintJunio C Hamano2-82/+15
2021-02-05Merge branch 'ug/doc-lose-dircache' into maintJunio C Hamano2-6/+4
2021-02-05Merge branch 'ad/t4129-setfacl-target-fix' into maintJunio C Hamano1-1/+1
2021-02-05Merge branch 'jk/t5516-deflake' into maintJunio C Hamano1-1/+3
2021-02-05Merge branch 'vv/send-email-with-less-secure-apps-access' into maintJunio C Hamano1-1/+5
2021-02-05Merge branch 'pb/mergetool-tool-help-fix' into maintJunio C Hamano2-2/+15
2021-02-05Merge branch 'ds/for-each-repo-noopfix' into maintJunio C Hamano2-0/+13
2021-02-05Merge branch 'jc/sign-off' into maintJunio C Hamano1-1/+1
2021-02-05Merge branch 'mt/t4129-with-setgid-dir' into maintJunio C Hamano1-2/+7
2021-02-05Merge branch 'en/stash-apply-sparse-checkout' into maintJunio C Hamano3-57/+212
2021-02-05Merge branch 'nk/perf-fsmonitor-cleanup' into maintJunio C Hamano1-1/+6