summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
...
* | | | | | | | | Merge branch 'ns/batched-fsync' into nextJunio C Hamano2021-10-27-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ns/tmp-objdir' into ns/batched-fsyncJunio C Hamano2021-10-27-0/+46
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'ns/tmp-objdir' into nextJunio C Hamano2021-10-27-0/+46
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | fixup! tmp-objdir: new API for creating temporary writable databasesNeeraj Singh2021-10-27-0/+45
| * | | | | | | | | | fixup! tmp-objdir: new API for creating temporary writable databasesNeeraj Singh2021-10-27-0/+1
* | | | | | | | | | | Merge branch 'ab/fix-make-lint-docs' into nextJunio C Hamano2021-10-27-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/Makefile: fix lint-docs mkdir dependencyJeff King2021-10-27-2/+2
* | | | | | | | | | | | Sync with masterJunio C Hamano2021-10-25-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | The fifteenth batchJunio C Hamano2021-10-25-0/+38
| * | | | | | | | | | | | Merge branch 'ab/test-lib-diff-cleanup'Junio C Hamano2021-10-25-433/+53
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/fix-make-lint-docs'Junio C Hamano2021-10-25-13/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'ab/pkt-line-cleanup'Junio C Hamano2021-10-25-53/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/fix-midx-rename-while-mapped'Junio C Hamano2021-10-25-19/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/test-cleanly-recreate-trash-directory'Junio C Hamano2021-10-25-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-commit-header-continuation-line'Junio C Hamano2021-10-25-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/mark-leak-free-tests-more'Junio C Hamano2021-10-25-11/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/mark-leak-free-tests'Junio C Hamano2021-10-25-0/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/parse-options-cleanup'Junio C Hamano2021-10-25-56/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/userdiff-cpp'Junio C Hamano2021-10-25-67/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/mergetools-special-case-xxdiff-exit-128'Junio C Hamano2021-10-25-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fs/ssh-signing-fix'Junio C Hamano2021-10-25-6/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fs/ssh-signing'Junio C Hamano2021-10-25-66/+1341
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/sparse-cache-tree-verify-fix'Junio C Hamano2021-10-25-9/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/fix-commit-error-message-upon-unwritable-object-store'Junio C Hamano2021-10-25-16/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/add-dry-run-without-objects'Junio C Hamano2021-10-25-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/disable-gc-during-perf-tests'Junio C Hamano2021-10-25-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano2021-10-25-68/+148
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/unpack-trees-leakfix'Junio C Hamano2021-10-25-22/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/perf-remove-test-times'Junio C Hamano2021-10-25-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/fsck-unexpected-type'Junio C Hamano2021-10-25-162/+478
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ma/doc-git-version' into nextJunio C Hamano2021-10-25-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git.txt: fix typoMartin Ågren2021-10-25-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/expand-runtime-prefix' into nextJunio C Hamano2021-10-25-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.txt: fix typoMartin Ågren2021-10-25-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bs/archive-doc-compression-level' into nextJunio C Hamano2021-10-25-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | archive: describe compression level optionBagas Sanjaya2021-10-25-5/+12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/submodule-add-message-fix' into nextJunio C Hamano2021-10-25-14/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: fix incorrect newlines in an error messageKaartic Sivaraam2021-10-23-14/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gc/use-repo-settings' into nextJunio C Hamano2021-10-25-12/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gc: perform incremental repack when implictly enabledGlen Choo2021-10-15-7/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: verify multi-pack-index when implictly enabledGlen Choo2021-10-15-2/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: verify commit graph when implicitly enabledGlen Choo2021-10-15-3/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-re...Junio C Hamano2021-10-15-11/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'so/stash-staged' into nextJunio C Hamano2021-10-25-12/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stash: implement '--staged' option for 'push' and 'save'Sergey Organov2021-10-18-12/+113
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into nextJunio C Hamano2021-10-25-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-graph: don't consider "replace" objects with "verify"Ævar Arnfjörð Bjarmason2021-10-15-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-graph tests: fix another graph_git_two_modes() helperÆvar Arnfjörð Bjarmason2021-10-15-8/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-graph tests: fix error-hiding graph_git_two_modes() helperÆvar Arnfjörð Bjarmason2021-10-15-2/+2
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hm/paint-hits-in-log-grep' into nextJunio C Hamano2021-10-25-46/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \