Code

History

Commits on encoding-fallback2730+
  1. add report for September 2024Sebastian Thiel committed 2 years ago06f84de
  2. More clarity for supported featuresSebastian Thiel committed 2 years agoa70cdac
  3. Merge pull request #1611 from Byron/mergeSebastian Thiel committed 2 years ago5ffccd2
  4. adjust journey tests to deal with merge commandSebastian Thiel committed 2 years ago9039969
  5. feat: add `gix merge-file` with similar features as `git merge-file`Sebastian Thiel committed 2 years ago3da2da9
  6. feat: add `Repository::blob_merge_options()` to obtain options for merging blobs and `Repository::diff_algorithm()`Sebastian Thiel committed 2 years agoc02adc7
  7. fix!: unify location of error type of `Repository::diff_resource_cache()`.Sebastian Thiel committed 2 years ago9e79ba3
  8. feat: `Repository::merge_resource_cache()` to obtain the foundation for merging files directly.Sebastian Thiel committed 2 years ago1937480
  9. add all keys for merge-configurationSebastian Thiel committed 2 years agoe0b09d2
  10. make `blob::Platform::filter_mode` public.Sebastian Thiel committed 2 years agob26eb26
  11. Merge pull request #1585 from Byron/mergeSebastian Thiel committed 2 years ago2261de4
  12. add platform tests and implementationSebastian Thiel committed 2 years agoeb37dc3
  13. add all relevant tests for the merge processing pipelineSebastian Thiel committed 2 years agoa6f3e30
  14. improve docs around worktree-filters and renormalizationSebastian Thiel committed 2 years agoad9587a
  15. fix: `ValueRef::as_bstr()` now uses the correct lifetime.Sebastian Thiel committed 2 years ago21bca6c
  16. Implement `text` and `binary` merge algorithms, also with baseline tests for correctness.Sebastian Thiel committed 2 years ago0762846
  17. Sketch the entire API surface to capture all parts of blob-mergesSebastian Thiel committed 2 years ago9efa09f
  18. use new `WorktreeRoot` API provided by `gix-diff`Sebastian Thiel committed 2 years ago25c6806
  19. feat: Add `blob::pipeline::WorktreeRoots::is_unset()`Sebastian Thiel committed 2 years agofe7ecd0
  20. add the `gix-merge` crate for capturing merge algorithmsSebastian Thiel committed 2 years ago65efcb7
  21. add performance notes related to an arena-backed internet BString compatible typeSebastian Thiel committed 2 years agoec771b4
  22. Merge pull request #1610 from nrdxp/traverse/oldest-firstSebastian Thiel committed 2 years ago20f9b3f
  23. adapt to changes in `gix-traverse`Timothy DeHerrera committed 2 years ago6862c27
  24. feat!: Support for 'fast-tracking' reaching the beginning of the commit-graph during traversals.Timothy DeHerrera committed 2 years ago14d6bb9
  25. add tests for new simple commit orderingSebastian Thiel committed 2 years ago6ac14d7
  26. feat!: add option to traverse commits from oldest to newestTimothy DeHerrera committed 2 years ago1dbb94a
  27. Merge pull request #1607 from EliahKagan/count-shSebastian Thiel committed 2 years ago7bf2f4f
  28. Revert "simplify .gitattributes"Eliah Kagan committed 2 years agod3c3237
  29. simplify .gitattributesSebastian Thiel committed 2 years agoa75e970
  30. always run everything on CI to prevent never-succeeding CI (#1608)Sebastian Thiel committed 2 years agobfe363c
  31. Tell github-linguist to count fixture shell scriptsEliah Kagan committed 2 years ago548a383
  32. Merge pull request #1609 from EliahKagan/fuzz-lessSebastian Thiel committed 2 years ago15457c9
  33. Merge pull request #1606 from EliahKagan/fixture-timeoutSebastian Thiel committed 2 years ago8c9e827
  34. Only fuzz test PRs that run the test suiteEliah Kagan committed 2 years agoa48965c
  35. fix: Double the fixture lock timeoutEliah Kagan committed 2 years ago39323c3