Code

History

Commits on ig/vimdiffwarn to cli/tests/test_squash_command.rs35+
  1. cli: pad empty description intro/instruction lines with "JJ:"Yuya Nishihara committed 1 year ago4bcebe6
  2. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  3. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  4. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  5. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  6. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  7. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  8. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  9. tests: migrate callers of jj_cmd_cli_error() to run_jj_in()Yuya Nishihara committed 1 year agob79b29c
  10. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  11. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  12. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  13. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  14. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  15. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  16. cli: update "only_path" warnings to say fileset expression instead of pathYuya Nishihara committed 2 years ago5396138
  17. cli: squash: use draft description template to generate editor contentYuya Nishihara committed 1 year ago832e7b3
  18. cli: refer to fileset argument using `FILESETS` in synopsisMartin von Zweigbergk committed 1 year agoa414441
  19. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  20. cli: consider "JJ:" lines as comments also when not followed by spaceMartin von Zweigbergk committed 1 year ago7618b52
  21. log: emit working-copy branch first if included in the revsetYuya Nishihara committed 2 years ago1973c71
  22. cli: reorder updating and reporting for consistency.Essien Ita Essien committed 2 years ago76f40e5
  23. conflicts: Highlight change ids in rebase adviceLukas Wirth committed 2 years agobccd821
  24. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  25. cli: rename `obslog` to `evolution-log`/`evolog`Martin von Zweigbergk committed 2 years agoa0fae76
  26. cli squash: explain --into in error message for merge commitsIlya Grigoriev committed 2 years ago6f44ed4
  27. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  28. cli_util: add missing word in conflict resolution instructionsVincent Ging Ho Yim committed 2 years ago79b326d
  29. Enable the new graph nodes by default.Anton Älgmyr committed 2 years agoc7eac90
  30. obslog: reverse order of predecessors in topo traversalScott Taylor committed 2 years ago91504ca
  31. cli: skip formatting instructions if not requiredScott Taylor committed 2 years agob27ff28
  32. windows: avoid UNC paths in `run_ui_editor`mlcui committed 2 years agoc256ad8
  33. feat(squash): Add `--keep-emptied` flagMatt Stark committed 2 years agoca4eb60
  34. chore: Make squash tests log empty commits.Matt Stark committed 2 years ago7682a03
  35. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5