| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'jk/pack-objects-bitmap-progress-fix' | Junio C Hamano | 2021-04-20 | 1 | -0/+23 |
| |\ | |||||
| | * | pack-objects: update "nr_seen" progress based on pack-reused count | Jeff King | 2021-04-12 | 1 | -0/+23 |
| * | | Merge branch 'ab/userdiff-tests' | Junio C Hamano | 2021-04-20 | 6 | -52/+87 |
| |\ \ | |||||
| | * | | blame tests: simplify userdiff driver test | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -21/+15 |
| | * | | blame tests: don't rely on t/t4018/ directory | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -3/+13 |
| | * | | userdiff: remove support for "broken" tests | Ævar Arnfjörð Bjarmason | 2021-04-08 | 2 | -10/+1 |
| | * | | userdiff tests: list builtin drivers via test-tool | Ævar Arnfjörð Bjarmason | 2021-04-08 | 4 | -27/+67 |
| | * | | userdiff tests: explicitly test "default" pattern | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -0/+1 |
| * | | | Merge branch 'ar/userdiff-scheme' | Junio C Hamano | 2021-04-20 | 16 | -0/+90 |
| |\ \ \ | |||||
| | * | | | userdiff: add support for Scheme | Atharva Raykar | 2021-04-08 | 16 | -0/+90 |
| * | | | | Merge branch 'en/ort-readiness' | Junio C Hamano | 2021-04-16 | 8 | -10/+183 |
| |\ \ \ \ | |||||
| | * | | | | Add testing with merge-ort merge strategy | Elijah Newren | 2021-03-20 | 1 | -0/+2 |
| | * | | | | t6423: mark remaining expected failure under merge-ort as such | Elijah Newren | 2021-03-20 | 1 | -1/+1 |
| | * | | | | t: mark several submodule merging tests as fixed under merge-ort | Elijah Newren | 2021-03-20 | 5 | -9/+22 |
| | * | | | | merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries | Elijah Newren | 2021-03-20 | 1 | -2/+2 |
| | * | | | | t6428: new test for SKIP_WORKTREE handling and conflicts | Elijah Newren | 2021-03-20 | 1 | -0/+158 |
| * | | | | | Merge branch 'jz/apply-3way-cached' | Junio C Hamano | 2021-04-15 | 1 | -0/+50 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-apply: allow simultaneous --cached and --3way options | Jerry Zhang | 2021-04-07 | 1 | -0/+50 |
| * | | | | | | Merge branch 'jz/apply-run-3way-first' | Junio C Hamano | 2021-04-15 | 1 | -0/+20 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | git-apply: try threeway first when "--3way" is used | Jerry Zhang | 2021-04-06 | 1 | -0/+20 |
| * | | | | | | Merge branch 'cc/test-helper-bloom-usage-fix' | Junio C Hamano | 2021-04-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | test-bloom: fix missing 'bloom' from usage string | Christian Couder | 2021-04-05 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'ab/send-email-validate-errors' | Junio C Hamano | 2021-04-13 | 1 | -8/+27 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | git-send-email: improve --validate error output | Ævar Arnfjörð Bjarmason | 2021-04-06 | 1 | -5/+12 |
| | * | | | | | | | git-send-email: test full --validate output | Ævar Arnfjörð Bjarmason | 2021-04-06 | 1 | -6/+18 |
| * | | | | | | | | Merge branch 'tb/pack-preferred-tips-to-give-bitmap' | Junio C Hamano | 2021-04-13 | 4 | -0/+64 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | builtin/pack-objects.c: respect 'pack.preferBitmapTips' | Taylor Blau | 2021-03-31 | 1 | -0/+38 |
| | * | | | | | | | | t/helper/test-bitmap.c: initial commit | Taylor Blau | 2021-03-31 | 3 | -0/+26 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'jk/ref-filter-segfault-fix' | Junio C Hamano | 2021-04-13 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | ref-filter: fix NULL check for parse object failure | Jeff King | 2021-04-01 | 1 | -0/+10 |
| * | | | | | | | | | Merge branch 'en/ort-perf-batch-9' | Junio C Hamano | 2021-04-08 | 1 | -0/+71 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | | merge-ort: precompute subset of sources for which we need rename detection | Elijah Newren | 2021-03-10 | 1 | -0/+71 |
| * | | | | | | | | | Merge branch 'en/sequencer-edit-upon-conflict-fix' | Junio C Hamano | 2021-04-08 | 1 | -1/+31 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | sequencer: fix edit handling for cherry-pick and revert messages | Elijah Newren | 2021-03-31 | 1 | -1/+31 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'll/clone-reject-shallow' | Junio C Hamano | 2021-04-08 | 3 | -1/+60 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | builtin/clone.c: add --reject-shallow option | Li Linchao | 2021-04-01 | 3 | -1/+60 |
| | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'tb/reverse-midx' | Junio C Hamano | 2021-04-08 | 2 | -4/+62 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | midx: allow marking a pack as preferred | Taylor Blau | 2021-04-01 | 1 | -0/+42 |
| | * | | | | | | | | | t/helper/test-read-midx.c: add '--show-objects' | Taylor Blau | 2021-03-30 | 1 | -4/+20 |
| | * | | | | | | | | | Merge branch 'ds/chunked-file-api' into tb/reverse-midx | Junio C Hamano | 2021-02-24 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'ps/pack-bitmap-optim' | Junio C Hamano | 2021-04-07 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | pack-bitmap: avoid traversal of objects referenced by uninteresting tag | Patrick Steinhardt | 2021-03-22 | 1 | -0/+14 |
| * | | | | | | | | | | | | Merge branch 'zh/commit-trailer' | Junio C Hamano | 2021-04-07 | 1 | -0/+312 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | commit: add --trailer option | ZheNing Hu | 2021-03-23 | 1 | -0/+312 |
| | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'zh/format-patch-fractional-reroll-count' | Junio C Hamano | 2021-04-02 | 2 | -0/+58 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | format-patch: allow a non-integral version numbers | ZheNing Hu | 2021-03-23 | 2 | -0/+58 |
| * | | | | | | | | | | | | Merge branch 'jh/simple-ipc' | Junio C Hamano | 2021-04-02 | 4 | -0/+911 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | t0052: add simple-ipc tests and t/helper/test-simple-ipc tool | Jeff Hostetler | 2021-03-22 | 4 | -0/+911 |
| * | | | | | | | | | | | | Merge branch 'ab/detox-gettext-tests' | Junio C Hamano | 2021-03-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | mktag tests: fix broken "&&" chain | Ævar Arnfjörð Bjarmason | 2021-03-23 | 1 | -1/+1 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |