Code

History

Commits on encoding-fallback2380+
  1. fix: don't incorrectly mark as auto-resolved conflict if there was none.Sebastian Thiel committed 1 year agoda585db
  2. adapt to changes in `gix-merge`Sebastian Thiel committed 1 year agoaaeb427
  3. fix!: assure that `tree::apply_index_entries()` cannot unknowingly leave unconflicted *and* conflicted entries.Sebastian Thiel committed 1 year ago3e94b58
  4. refactor `gix-url` testsSebastian Thiel committed 1 year ago01f66eb
  5. fix: assure passwords aren't returned in percent-encoded form.Sebastian Thiel committed 1 year ago530257f
  6. fix: enforce `diff.renamelimit` even for identical name matchingSebastian Thiel committed 1 year agod281ba6
  7. adapt to changes in `gix`Sebastian Thiel committed 1 year ago9896d5d
  8. fix!: assure that rename tracking can be turned off.Sebastian Thiel committed 1 year agobd905a6
  9. fix: public access to the contained repository in wrapped types, like `Id`.Sebastian Thiel committed 1 year agoefc71fd
  10. fix: create a more local lock when creating writable fixtures.Sebastian Thiel committed 1 year ago8b694a6
  11. Improve merge related API in `gix`Sebastian Thiel committed 1 year agob2b8181
  12. feat: add `--tree-favor` to `gix merge tree|commit`.Sebastian Thiel committed 1 year ago471e046
  13. feat: add `merge::tree::TreeFavor` similar to `*::FileFavor`.Sebastian Thiel committed 1 year agoe17b3a9
  14. implement support for resolving irreconcilable tree conflicts with 'ours' or 'ancestor'Sebastian Thiel committed 1 year agoe487cca
  15. Merge pull request #1712 from EliahKagan/run-ci/git-bashSebastian Thiel committed 1 year agofadf106
  16. Fix an ambiguous `expect` messageEliah Kagan committed 1 year ago1f6a866
  17. fix: Run test fixture scripts on Windows with Git BashEliah Kagan committed 1 year agofe3f2d1
  18. Refine `EXEC_PATH` validation in `spawn_git_daemon`Eliah Kagan committed 1 year ago479c06b
  19. Run `cargo fmt`Eliah Kagan committed 1 year agoda03932
  20. Use consistent `git` command name in gix-testtoolsEliah Kagan committed 1 year agoe30c070
  21. Rename `parse_gix_version` to `parse_git_version`Eliah Kagan committed 1 year ago01737ad
  22. Merge pull request #1711 from EliahKagan/run-ci/mode-itSebastian Thiel committed 1 year agoc146b7a
  23. minor refactorsSebastian Thiel committed 1 year ago7e8aedf
  24. Eliminate a variable that didn't make things clearerEliah Kagan committed 1 year ago5a803b3
  25. Copyedit and clarify `CheckMode` doc commentEliah Kagan committed 1 year agoe57167f
  26. Run `check-mode` recipe on CI via `ci-test` recipeEliah Kagan committed 1 year ago8729858
  27. Run the `check-mode` CI job only on UbuntuEliah Kagan committed 1 year ago2305099
  28. Quote `{{ it }}` in `justfile` to fix recipe in WindowsEliah Kagan committed 1 year ago3f5d31b
  29. Use `it check-mode` instead of `check-mode.sh`; test on CIEliah Kagan committed 1 year ago2107e17
  30. Fix path formatting; refactor slightly for clarityEliah Kagan committed 1 year agob17935b
  31. More of a sketch of `check_mode` "translation" to RustEliah Kagan committed 1 year ago76268f8
  32. Partial sketch of `check_mode` "translation" to RustEliah Kagan committed 1 year ago967b9df
  33. Merge pull request #1709 from EliahKagan/run-ci/mode-nextSebastian Thiel committed 1 year agoee33221
  34. Have `check-mode.sh` handle errors better on macOSEliah Kagan committed 1 year ago530948d
  35. Remove temporary test files for leading-whitespace pathsEliah Kagan committed 1 year agoa9b3b48