Code

History

Commits on encoding-fallback2625+
  1. Regenerate gix-index fixture archiveEliah Kagan committed 2 years agoeab6735
  2. Set +x in index in v2_all_file_kinds and v2_deeper_tree fixturesEliah Kagan committed 2 years agof72ff21
  3. Run `cargo fmt`Eliah Kagan committed 2 years ago06a2353
  4. Set +x in index in gix-archive basic fixture, adjust testsEliah Kagan committed 2 years ago470c76e
  5. Update tree-baseline archiveEliah Kagan committed 2 years agoab45415
  6. Set +x in index in added-file-changed-content-and-modeEliah Kagan committed 2 years ago6faf11a
  7. Set +x in index in same-rename-different-mode baselineEliah Kagan committed 2 years ago041bdde
  8. Merge pull request #1618 from GitoxideLabs/mergeSebastian Thiel committed 2 years ago3fb989b
  9. feat: add `gix merge tree` to merge trees similarly to `git merge-tree`.Sebastian Thiel committed 2 years ago84707c2
  10. feat: add `Repository::merge_trees()`Sebastian Thiel committed 2 years agod1ac584
  11. feat: `gix::Repository` implements all traits for object reading and writing.Sebastian Thiel committed 2 years ago07746f3
  12. feat: respect the `conflict-marker-size` attribute as well.Sebastian Thiel committed 2 years agobd91d6a
  13. support for merge related options in config treeSebastian Thiel committed 2 years ago80e006b
  14. feat: add `tree()` and `commit()` merge support, en par with `merge-ORT` as far as tests go.Sebastian Thiel committed 2 years ago4b1764c
  15. adapt to changes in `gix-object` and `gix-odb`Sebastian Thiel committed 2 years ago96488f7
  16. feat!: move `gix-odb::Write` trait to `gix-object::Write`.Sebastian Thiel committed 2 years ago7325c58
  17. fix: make sure ordinary capitalized partial names can be found by partial name.Sebastian Thiel committed 2 years ago1fbb946
  18. feat: support rename tracking across changed directoriesSebastian Thiel committed 2 years agoba7b811
  19. feat: `FindExt` now supports empty trees and empty blobs natively.Sebastian Thiel committed 2 years ago29aad45
  20. fix!: Adjust blob-merge baseline to also test the reverse of each operationSebastian Thiel committed 2 years agode1cfb6
  21. adapt to changes in `gix-merge`Sebastian Thiel committed 2 years ago278dd88
  22. feat: add `blob::PlatformRef::id_by_pick()` to more efficiently pick merge results.Sebastian Thiel committed 2 years agodd99991
  23. feat!: Don't fail on big files during blob-merge, but turn them into binary merges.Sebastian Thiel committed 2 years agoc1cf08c
  24. fix!: prefer to receive borrowed `gix_command::Context` when it's just passed on.Sebastian Thiel committed 2 years ago78a5355
  25. feat: Add `tree::Editor::get()` to get entries directly from the editor.Sebastian Thiel committed 2 years agoe2ea398
  26. feat: add traits for partial equality comparison to `tree_with_rewrites::Change` typesSebastian Thiel committed 2 years ago6740520
  27. feat: add `tree_with_rewrites::Change(Ref)::previous_location()`Sebastian Thiel committed 2 years ago76e6762
  28. feat: Allow access to `tree::State::buf1|2`.Sebastian Thiel committed 2 years agoeb55c00
  29. Improve error message to be less elusiveSebastian Thiel committed 2 years agoeb9f9c3
  30. Add a link to OpenCollectiveSebastian Thiel committed 2 years ago1f40a89
  31. fix: assure that `gix tree diff` doesn't slow down too much when shortening IDsSebastian Thiel committed 2 years ago32d6bfb
  32. Merge pull request #1648 from EliahKagan/run-ci/touch-nextSebastian Thiel committed 2 years ago417bf95
  33. Make `touch` logic in `file_metadata.sh` more portableEliah Kagan committed 2 years agoc430897
  34. Merge pull request #1647 from EliahKagan/ptyprocess-targets-nextSebastian Thiel committed 2 years agob351c27
  35. Remove inactive `username_password_not_available` testEliah Kagan committed 2 years ago1fc1471