Code

History

Commits on ig/commit-debug945+
  1. docs/tutorial: fix id of commit being squashed intoVincent Ging Ho Yim committed 1 year ago88deb56
  2. test: replace `cfg!` macro with `cfg_attr` attributeVincent Ging Ho Yim committed 1 year ago11b1c50
  3. cli: use complete sentences for each case of conflict resolution hintVincent Ging Ho Yim committed 1 year agof881213
  4. backend: make write_file() take an AsyncReadMartin von Zweigbergk committed 1 year ago1d1e0c9
  5. cli rebase: remove deprecated `--skip-empty` flagVincent Ging Ho Yim committed 1 year ago8e0049c
  6. cli undo: identify "double undo" by comparing operation descriptionsVincent Ging Ho Yim committed 1 year ago42c4c9c
  7. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  8. cli util completion: remove deprecated arguments for each shellVincent Ging Ho Yim committed 1 year ago365f26f
  9. cli util completion: add link to docs in doc commentVincent Ging Ho Yim committed 1 year agof491351
  10. test: clean up config stringsVincent Ging Ho Yim committed 1 year ago6ff4f45
  11. docs: fix minimum fish version with dynamic completions enabled by defaultVincent Ging Ho Yim committed 1 year ago4e4518d
  12. cli undo: detect "double undo" from operation metadata insteadVincent Ging Ho Yim committed 1 year ago96e73bd
  13. test: add more `undo` testsVincent Ging Ho Yim committed 1 year agoca7a6fc
  14. test: rename some `undo` tests to avoid specifying current behaviorVincent Ging Ho Yim committed 1 year agoab6473d
  15. cli undo: refactor `is_undo()` helper and rename to `resets_view_of()`Vincent Ging Ho Yim committed 1 year ago78d7008
  16. cli undo: upgrade first part of "double undo" hint to a warning, clarify repo stateVincent Ging Ho Yim committed 1 year ago7fffa36
  17. cli undo: refactor parent op logicVincent Ging Ho Yim committed 1 year ago32e2d56
  18. test: add tests for undoing root and merge operationsVincent Ging Ho Yim committed 1 year ago33e551d
  19. cli undo: fix error message for undoing root operationVincent Ging Ho Yim committed 1 year ago27331a5
  20. rebase: print summary of abandoned duplicate divergent commitsScott Taylor committed 1 year ago0666781
  21. rebase: abandon commits while rebasingScott Taylor committed 1 year ago4eabf9a
  22. rewrite: allow abandoning while moving commitsScott Taylor committed 1 year agoe75afec
  23. rebase: demo bug with skipping divergent commitsScott Taylor committed 1 year ago6b9e944
  24. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  25. cleanup: remove unused `mut`Winter committed 1 year ago3a37843
  26. cli: resolve: show a hint towards editing the conflict markers manually if the conflict has >2 sidesWinter committed 1 year ago2d1f50a
  27. cargo: upgrade rand and rand_chachaBenjamin Brittain committed 1 year ago662b4be
  28. backend: make read_file() return a AsyncReadMartin von Zweigbergk committed 1 year agob970939
  29. local_working_copy: take owned Read in write_file()Martin von Zweigbergk committed 1 year ago4f0e84f
  30. git_backend: make read_file_sync() return a Vec<u8>Martin von Zweigbergk committed 1 year ago3611796
  31. lib: return correct op set subexpression when reporting multiple operations foundVincent Ging Ho Yim committed 1 year ago763be4e
  32. test: demonstrate that `OpsetResolutionError::MultipleOperations` reports incorrect intermediate expressionVincent Ging Ho Yim committed 1 year ago55f2b1b
  33. test: extract helper function to assert the contents of `OpsetResolutionError::MultipleOperations`Vincent Ging Ho Yim committed 1 year agof113e28
  34. test: add assertions for contents of `OpsetResolutionError::MultipleOperations`Vincent Ging Ho Yim committed 1 year ago3bb9f11
  35. rebase: skip duplicate divergent commits by defaultScott Taylor committed 1 year agoc406b3a