summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.33-rc2v2.33.0-rc2Junio C Hamano2021-08-112-13/+1
* Merge branch 'jn/log-m-does-not-imply-p'Junio C Hamano2021-08-113-7/+6
|\
| * Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder2021-08-093-7/+6
* | Merge branch 'cb/many-alternate-optim-fixup'Junio C Hamano2021-08-113-10/+5
|\ \
| * | object-file: use unsigned arithmetic with bit maskRené Scharfe2021-08-111-1/+1
| * | object-store: avoid extra ';' from KHASH_INITCarlo Marcelo Arenas Belón2021-08-091-1/+1
| * | oidtree: avoid nested struct oidtree_nodeCarlo Marcelo Arenas Belón2021-08-091-8/+3
* | | Git 2.33-rc1v2.33.0-rc1Junio C Hamano2021-08-061-1/+1
* | | Merge branch 'cb/t7508-regexp-fix'Junio C Hamano2021-08-061-1/+1
|\ \ \
| * | | t7508: avoid non POSIX BRECarlo Marcelo Arenas Belón2021-08-021-1/+1
* | | | Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-08-061-1/+1
|\ \ \ \
| * | | | diff: --pickaxe-all typofixBagas Sanjaya2021-08-041-1/+1
* | | | | Merge branch 'fc/disable-checkwinsize'Junio C Hamano2021-08-061-0/+6
|\ \ \ \ \
| * | | | | test: fix for COLUMNS and bash 5Felipe Contreras2021-08-061-0/+6
* | | | | | The eighth batchJunio C Hamano2021-08-041-1/+16
* | | | | | Merge branch 'tb/mingw-rmdir-symlink-to-directory'Junio C Hamano2021-08-043-0/+37
|\ \ \ \ \ \
| * | | | | | mingw: align symlinks-related rmdir() behavior with LinuxThomas Bétous2021-08-023-0/+37
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ar/doc-markup-fix'Junio C Hamano2021-08-042-2/+2
|\ \ \ \ \ \
| * | | | | | Documentation: render special characters correctlyAndrei Rybak2021-07-302-2/+2
| |/ / / / /
* | | | | | Merge branch 'ab/getcwd-test'Junio C Hamano2021-08-045-1/+33
|\ \ \ \ \ \
| * | | | | | t0001: fix broken not-quite getcwd(3) test in bed67874e2Ævar Arnfjörð Bjarmason2021-07-305-1/+33
| |/ / / / /
* | | | | | Merge branch 'rs/use-fspathhash'Junio C Hamano2021-08-043-26/+8
|\ \ \ \ \ \
| * | | | | | use fspathhash() everywhereRené Scharfe2021-07-303-26/+8
* | | | | | | Merge branch 'pb/merge-autostash-more'Junio C Hamano2021-08-043-2/+24
|\ \ \ \ \ \ \
| * | | | | | | merge: apply autostash if merge strategy failsPhilippe Blain2021-07-232-0/+9
| * | | | | | | merge: apply autostash if fast-forward failsPhilippe Blain2021-07-232-0/+12
| * | | | | | | Documentation: define 'MERGE_AUTOSTASH'Philippe Blain2021-07-231-1/+2
| * | | | | | | merge: add missing word "strategy" to a messagePhilippe Blain2021-07-231-1/+1
* | | | | | | | Merge branch 'en/ort-perf-batch-14'Junio C Hamano2021-08-042-12/+389
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-ort: restart merge with cached renames to reduce process entry costElijah Newren2021-07-202-7/+87
| * | | | | | | | merge-ort: avoid recursing into directories when we don't need toElijah Newren2021-07-201-3/+99
| * | | | | | | | merge-ort: defer recursing into directories when merge base is matchedElijah Newren2021-07-201-2/+31
| * | | | | | | | merge-ort: add a handle_deferred_entries() helper functionElijah Newren2021-07-201-0/+64
| * | | | | | | | merge-ort: add data structures for allowable trivial directory resolvesElijah Newren2021-07-201-0/+61
| * | | | | | | | merge-ort: add some more explanations in collect_merge_info_callback()Elijah Newren2021-07-201-5/+15
| * | | | | | | | merge-ort: resolve paths early when we have sufficient informationElijah Newren2021-07-201-0/+37
* | | | | | | | | Merge branch 'ds/commit-and-checkout-with-sparse-index'Junio C Hamano2021-08-047-30/+240
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack-trees: resolve sparse-directory/file conflictsDerrick Stolee2021-07-202-12/+23
| * | | | | | | | | t1092: document bad 'git checkout' behaviorDerrick Stolee2021-07-201-2/+140
| * | | | | | | | | checkout: stop expanding sparse indexesDerrick Stolee2021-07-142-6/+12
| * | | | | | | | | sparse-index: recompute cache-treeDerrick Stolee2021-07-141-0/+2
| * | | | | | | | | commit: integrate with sparse-indexDerrick Stolee2021-07-143-6/+46
| * | | | | | | | | p2000: compress repo namesDerrick Stolee2021-07-141-10/+10
| * | | | | | | | | p2000: add 'git checkout -' test and decrease depthDerrick Stolee2021-07-141-7/+20
* | | | | | | | | | Merge branch 'ab/update-submitting-patches'Junio C Hamano2021-08-041-111/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SubmittingPatches: replace discussion of Travis with GitHub ActionsÆvar Arnfjörð Bjarmason2021-07-221-32/+17
| * | | | | | | | | | SubmittingPatches: move discussion of Signed-off-by above "send"Ævar Arnfjörð Bjarmason2021-07-221-79/+79
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ah/plugleaks'Junio C Hamano2021-08-0412-27/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reset: clear_unpack_trees_porcelain to plug leakAndrzej Hunt2021-07-261-2/+2
| * | | | | | | | | | builtin/rebase: fix options.strategy memory lifecycleAndrzej Hunt2021-07-261-1/+2