| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | reftable: document an alternate cleanup method on Windows | Han-Wen Nienhuys | 2021-04-12 | 1 | -2/+7 | |
| * | | | | | | | | | Merge branch 'jk/pack-objects-bitmap-progress-fix' | Junio C Hamano | 2021-04-20 | 2 | -1/+25 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | pack-objects: update "nr_seen" progress based on pack-reused count | Jeff King | 2021-04-12 | 2 | -1/+25 | |
| | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'ab/userdiff-tests' | Junio C Hamano | 2021-04-20 | 9 | -109/+213 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | 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 | 5 | -27/+68 | |
| | * | | | | | | | | | userdiff tests: explicitly test "default" pattern | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -0/+1 | |
| | * | | | | | | | | | userdiff: add and use for_each_userdiff_driver() | Ævar Arnfjörð Bjarmason | 2021-04-08 | 2 | -12/+71 | |
| | * | | | | | | | | | userdiff style: normalize pascal regex declaration | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -3/+2 | |
| | * | | | | | | | | | userdiff style: declare patterns with consistent style | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -5/+15 | |
| | * | | | | | | | | | userdiff style: re-order drivers in alphabetical order | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -38/+38 | |
| * | | | | | | | | | | Merge branch 'ar/userdiff-scheme' | Junio C Hamano | 2021-04-20 | 18 | -0/+101 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | userdiff: add support for Scheme | Atharva Raykar | 2021-04-08 | 18 | -0/+101 | |
| * | | | | | | | | | | | The eleventh (aka "ort") batch | Junio C Hamano | 2021-04-16 | 1 | -0/+6 | |
| * | | | | | | | | | | | Merge branch 'ah/merge-ort-ubsan-fix' | Junio C Hamano | 2021-04-16 | 1 | -14/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | merge-ort: only do pointer arithmetic for non-empty lists | Andrzej Hunt | 2021-04-12 | 1 | -13/+5 | |
| | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'en/ort-readiness' | Junio C Hamano | 2021-04-16 | 16 | -38/+446 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Add testing with merge-ort merge strategy | Elijah Newren | 2021-03-20 | 2 | -0/+3 | |
| | * | | | | | | | | | | | t6423: mark remaining expected failure under merge-ort as such | Elijah Newren | 2021-03-20 | 1 | -1/+1 | |
| | * | | | | | | | | | | | Revert "merge-ort: ignore the directory rename split conflict for now" | Elijah Newren | 2021-03-20 | 1 | -12/+1 | |
| | * | | | | | | | | | | | merge-recursive: add a bunch of FIXME comments documenting known bugs | Elijah Newren | 2021-03-20 | 1 | -0/+37 | |
| | * | | | | | | | | | | | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict | Elijah Newren | 2021-03-20 | 6 | -0/+20 | |
| | * | | | | | | | | | | | 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 | 2 | -15/+32 | |
| | * | | | | | | | | | | | t6428: new test for SKIP_WORKTREE handling and conflicts | Elijah Newren | 2021-03-20 | 1 | -0/+158 | |
| | * | | | | | | | | | | | merge-ort: support subtree shifting | Elijah Newren | 2021-03-20 | 1 | -0/+24 | |
| | * | | | | | | | | | | | merge-ort: let renormalization change modify/delete into clean delete | Elijah Newren | 2021-03-20 | 1 | -2/+62 | |
| | * | | | | | | | | | | | merge-ort: have ll_merge() use a special attr_index for renormalization | Elijah Newren | 2021-03-20 | 1 | -2/+62 | |
| | * | | | | | | | | | | | merge-ort: add a special minimal index just for renormalization | Elijah Newren | 2021-03-20 | 1 | -0/+20 | |
| | * | | | | | | | | | | | merge-ort: use STABLE_QSORT instead of QSORT where required | Elijah Newren | 2021-03-20 | 1 | -1/+7 | |
| * | | | | | | | | | | | | Merge branch 'en/ort-perf-batch-10' | Junio C Hamano | 2021-04-16 | 3 | -47/+281 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | diffcore-rename: determine which relevant_sources are no longer relevant | Elijah Newren | 2021-03-18 | 1 | -1/+50 | |
| | * | | | | | | | | | | | merge-ort: record the reason that we want a rename for a file | Elijah Newren | 2021-03-18 | 2 | -5/+16 | |
| | * | | | | | | | | | | | diffcore-rename: add computation of number of unknown renames | Elijah Newren | 2021-03-18 | 2 | -4/+40 | |
| | * | | | | | | | | | | | diffcore-rename: check if we have enough renames for directories early on | Elijah Newren | 2021-03-18 | 1 | -10/+63 | |
| | * | | | | | | | | | | | diffcore-rename: only compute dir_rename_count for relevant directories | Elijah Newren | 2021-03-18 | 1 | -5/+22 | |
| | * | | | | | | | | | | | merge-ort: record the reason that we want a rename for a directory | Elijah Newren | 2021-03-18 | 3 | -4/+46 | |
| | * | | | | | | | | | | | merge-ort, diffcore-rename: tweak dirs_removed and relevant_source type | Elijah Newren | 2021-03-18 | 3 | -40/+41 | |
| | * | | | | | | | | | | | diffcore-rename: take advantage of "majority rules" to skip more renames | Elijah Newren | 2021-03-18 | 1 | -0/+25 | |
| * | | | | | | | | | | | | The tenth batch | Junio C Hamano | 2021-04-15 | 1 | -0/+12 | |
| * | | | | | | | | | | | | Merge branch 'jz/apply-3way-cached' | Junio C Hamano | 2021-04-15 | 3 | -5/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | git-apply: allow simultaneous --cached and --3way options | Jerry Zhang | 2021-04-07 | 3 | -5/+60 | |
| * | | | | | | | | | | | | | Merge branch 'ab/complete-cherry-pick-head' | Junio C Hamano | 2021-04-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | bash completion: complete CHERRY_PICK_HEAD | Ævar Arnfjörð Bjarmason | 2021-04-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Merge branch 'jz/apply-run-3way-first' | Junio C Hamano | 2021-04-15 | 3 | -10/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | / / / / | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | git-apply: try threeway first when "--3way" is used | Jerry Zhang | 2021-04-06 | 3 | -10/+28 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | The ninth batch | Junio C Hamano | 2021-04-13 | 1 | -0/+25 | |
| * | | | | | | | | | | | | Merge branch 'vs/completion-with-set-u' | Junio C Hamano | 2021-04-13 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |