Code

History

Commits on ig/diff-multiples-warning to cli/tests/test_absorb_command.rs35+
  1. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 8 months ago3a9e56d
  2. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  3. conflicts: use "revision" instead of "commit" in labelsScott Taylor committed 10 months ago389c778
  4. absorb: add conflict labelsScott Taylor committed 11 months agof52fd2c
  5. templates: add "divergent" label to log for divergent changesScott Taylor committed 11 months ago33ad38b
  6. rewrite: add conflict labels for rebased commitsScott Taylor committed 1 year ago144ba76
  7. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  8. templates: show change offsets for divergent and hidden commitsScott Taylor committed 1 year ago0dffb6f
  9. revset: enable glob string matching by defaultYuya Nishihara committed 12 months ago97375fa
  10. tests: update cargo insta snapshotsTheo Buehler committed 11 months agocfb6509
  11. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  12. tests: specify string pattern prefix, use subject(glob:_) accordinglyYuya Nishihara committed 12 months ago3b37ed1
  13. cli: `jj absorb` warns when fileset doesn't existTejas Sanap committed 1 year ago7b32e10
  14. cli: evolog: migrate to evolution template typeYuya Nishihara committed 1 year agoa4cf4f2
  15. cli: evolog: show associated operations alongside commitsYuya Nishihara committed 1 year ago6dfc9de
  16. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  17. rebase: avoid using "onto destination" when argument can be `-A/-B`Martin von Zweigbergk committed 1 year agoee9917e
  18. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  19. absorb: add basic support for file deletionYuya Nishihara committed 1 year ago39f481f
  20. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  21. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  22. cli: truncate list of abandoned/created/updated commitsYuya Nishihara committed 1 year ago976f358
  23. tests: port test_absorb_command.rs to TestWorkDir API, add read_file() helperYuya Nishihara committed 1 year agod5d4c7f
  24. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  25. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  26. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  27. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  28. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  29. cli: improve hint message when suggesting `--ignore-immutable`Bryce Berger committed 1 year ago708e1c5
  30. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  31. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  32. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  33. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  34. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  35. absorb: print status if source commit still contains diffsYuya Nishihara committed 1 year ago646bdab